From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Sat, 15 Nov 2014 18:05:35 +0100 Message-ID: <87a93smm1s.fsf@fencepost.gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87zjbsn236.fsf@fencepost.gnu.org> <87tx20v31g.fsf@uwakimon.sk.tsukuba.ac.jp> <83389kfloq.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416071173 30206 80.91.229.3 (15 Nov 2014 17:06:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 17:06:13 +0000 (UTC) Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 18:06:03 2014 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 1XpgnR-000834-VW for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 18:06:02 +0100 Original-Received: from localhost ([::1]:41295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgnR-0005he-5t for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:06:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgn7-0005hO-Bs for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:05:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpgn6-0006zh-22 for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:05:40 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgn5-0006zd-VG for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:05:39 -0500 Original-Received: from localhost ([127.0.0.1]:58947 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgn2-0006t6-Dg; Sat, 15 Nov 2014 12:05:38 -0500 Original-Received: by lola (Postfix, from userid 1000) id 5BAA9E0B2B; Sat, 15 Nov 2014 18:05:35 +0100 (CET) In-Reply-To: <83389kfloq.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 18:55:17 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:177208 Archived-At: Eli Zaretskii writes: >> From: "Stephen J. Turnbull" >> Date: Sun, 16 Nov 2014 01:31:23 +0900 >> Cc: emacs-devel@gnu.org >> >> David Kastrup writes: >> >> > Which seems like a really stupid idea since it means that HEAD@{1} >> > is different from @{1} but is the same as @@{1}. >> >> No, they all mean the same thing AFAICT. > > That's my conclusion as well, but you won't find that in the docs. > The description of @{n} explicitly mentions "reflog", but the > description of REFNAME@{n} only hints on that. dak@lola:/usr/local/tmp/lilypond$ git checkout issue216 Previous HEAD position was 2a67ab2... Doc: Document unit of \abs-fontsize Switched to branch 'issue216' Your branch is ahead of 'origin/master' by 2 commits. (use "git push" to publish your local commits) dak@lola:/usr/local/tmp/lilypond$ git reflog -1 @{4} fatal: Log for 'issue216' only has 4 entries. dak@lola:/usr/local/tmp/lilypond$ git reflog -1 @@{4} 2a67ab2 HEAD@{4}: checkout: moving from 2a67ab2aee4e826c1998684249ecd2e862e4804c -- David Kastrup