From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Fri, 27 Mar 2015 16:34:42 +0300 Message-ID: <83r3saa7il.fsf@gnu.org> References: <20150324163714.GA27775@thyrsus.com> <83y4mmpb1n.fsf@gnu.org> <87lhim9sqp.fsf@igel.home> <87egoc56qg.fsf@gnu.org> <83y4mjn196.fsf@gnu.org> <55143CDE.20200@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427463349 2579 80.91.229.3 (27 Mar 2015 13:35:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 13:35:49 +0000 (UTC) Cc: esr@thyrsus.com, emacs-devel@gnu.org, tsdh@gnu.org, schwab@linux-m68k.org, dgutov@yandex.ru To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 14:35:41 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YbUPf-0002cL-JB for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 14:35:03 +0100 Original-Received: from localhost ([::1]:50256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbUPe-0006pO-OM for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 09:35:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbUPR-0006p8-Au for emacs-devel@gnu.org; Fri, 27 Mar 2015 09:34:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbUPO-0000p6-3o for emacs-devel@gnu.org; Fri, 27 Mar 2015 09:34:49 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:51402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbUPN-0000mv-S4; Fri, 27 Mar 2015 09:34:46 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NLV00100HIAOJ00@mtaout28.012.net.il>; Fri, 27 Mar 2015 16:33:24 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLV00L33HNONZ50@mtaout28.012.net.il>; Fri, 27 Mar 2015 16:33:24 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184389 Archived-At: > Date: Fri, 27 Mar 2015 09:25:54 -0400 > From: Richard Stallman > CC: eliz@gnu.org, tsdh@gnu.org, esr@thyrsus.com, > schwab@linux-m68k.org, emacs-devel@gnu.org > > > Maybe you should try something like: > > > git push || git reset HEAD^ > > What does git reset HEAD^ do? It uncommits the last commit, but leaves your changes in the working tree, essentially returning you back to the situation before you committed. > Is it reliable? It never failed me, although I needed to use it only rarely, when my last commit had a mistake that I detected before pushing upstream. But I'll defer to the experts for the definitive opinions about its reliability.