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: git pull fails with merge conflicts. How can this possibly happen? Date: Sat, 15 Nov 2014 18:55:17 +0200 Message-ID: <83389kfloq.fsf@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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416070577 21733 80.91.229.3 (15 Nov 2014 16:56:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:56:17 +0000 (UTC) Cc: dak@gnu.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:56:10 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 1Xpgdu-00073j-GF for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:56:10 +0100 Original-Received: from localhost ([::1]:41115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgdu-0006SY-7k for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:56:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgdd-0006SD-DU for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:55:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpgdU-0003cI-Qw for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:55:53 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:53808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgdJ-0003YR-7G; Sat, 15 Nov 2014 11:55:33 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NF300800APAOE00@a-mtaout22.012.net.il>; Sat, 15 Nov 2014 18:55:32 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF3008YSB0JOZ00@a-mtaout22.012.net.il>; Sat, 15 Nov 2014 18:55:32 +0200 (IST) In-reply-to: <87tx20v31g.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:177205 Archived-At: > 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.