From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 12:52:19 +0000 Message-ID: <20150912125219.GD2322@acm.fritz.box> References: <20150912101514.GA2322@acm.fritz.box> <87pp1n6huz.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442062288 13370 80.91.229.3 (12 Sep 2015 12:51:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 12:51:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 14:51:19 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 1ZakGx-0000xr-7i for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 14:51:15 +0200 Original-Received: from localhost ([::1]:60729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakGw-0005rk-KA for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 08:51:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakGt-0005rb-At for emacs-devel@gnu.org; Sat, 12 Sep 2015 08:51:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZakGq-0002wP-42 for emacs-devel@gnu.org; Sat, 12 Sep 2015 08:51:11 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:41664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakGp-0002w3-Qe for emacs-devel@gnu.org; Sat, 12 Sep 2015 08:51:08 -0400 Original-Received: (qmail 96664 invoked by uid 3782); 12 Sep 2015 12:51:06 -0000 Original-Received: from acm.muc.de (p548A4594.dip0.t-ipconnect.de [84.138.69.148]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 12 Sep 2015 14:51:05 +0200 Original-Received: (qmail 13987 invoked by uid 1000); 12 Sep 2015 12:52:19 -0000 Content-Disposition: inline In-Reply-To: <87pp1n6huz.fsf@fencepost.gnu.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 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:189863 Archived-At: Hello, David. On Sat, Sep 12, 2015 at 12:40:20PM +0200, David Kastrup wrote: > Alan Mackenzie writes: > > Hello, Emacs. > > git has struck again, and another couple of hours valuable time have > > been lost. > > Having "staged" a change with `git add', I then tried to commit it with > > `git commit'. Somebody else had got in before me, so I had to pull > > their changes first - fair enough. > Uh, no? git commit goes to your local repository. There is nobody else > who could "get in before you". You never need to pull before > committing. You may want to rebase after pulling, depending on your > kind of change. My mistake. I'd committed the change, then tried to push it. Sorry about that. > > So I aborted this merge operation, in order to see what it's doing > > first. git has kindly discarded my (staged) change, leaving no record > > of its existence - good job I've still got a copy of the changed file > > in Emacs. Scrabbling around in the .git directory, I found the commit > > message in a file there. So all is not lost. > > How do I see what changes are in file-notify-tests.el, which is in the > > staging area? > git diff --cached Thanks! > > Time to save my changed file and have a coffee. Isn't git wonderful! > When things start looking fishy, don't just stumble on blindly. Save > what you got somewhere else, and _then_ try muddling through. That's > not particular to Git. Not totally, no. > -- > David Kastrup -- Alan Mackenzie (Nuremberg, Germany).