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:03:56 +0100 Message-ID: <87egt4mm4j.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416071061 28496 80.91.229.3 (15 Nov 2014 17:04:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 17:04:21 +0000 (UTC) Cc: 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 18:04:14 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 1Xpglh-0001yG-JL for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 18:04:13 +0100 Original-Received: from localhost ([::1]:41291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpglh-0004yi-05 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:04:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpglT-0004wW-1o for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:03:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpglS-0006Xy-3a for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:03:59 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpglS-0006Xs-0J for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:03:58 -0500 Original-Received: from localhost ([127.0.0.1]:58915 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpglR-0006Y2-Bq; Sat, 15 Nov 2014 12:03:57 -0500 Original-Received: by lola (Postfix, from userid 1000) id 4009BE0B2B; Sat, 15 Nov 2014 18:03:56 +0100 (CET) In-Reply-To: <87tx20v31g.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Sun, 16 Nov 2014 01:31:23 +0900") 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:177207 Archived-At: "Stephen J. Turnbull" writes: > 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. Not if you changed branches recently. @{1} refers to the reflog of the current branch, HEAD@{1} or @@{1} are the reflog of the whole repository, including all branch switches. > The first and third are obviously the same. The second is defined as > meaning @{1}, but I believe that is implemented by > dereffing HEAD. Nope. > I'm not sure what happens if HEAD is detached, but that will happen > regardless of which notation you use. @{1} will then revert to the global reflog and then all three are indeed equal. But not with a branch checked out. -- David Kastrup