From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Sun, 16 Nov 2014 03:25:52 +0900 Message-ID: <87r3x4uxqn.fsf@uwakimon.sk.tsukuba.ac.jp> 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> <87egt4mm4j.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1416076031 6335 80.91.229.3 (15 Nov 2014 18:27:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 18:27:11 +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 Nov 15 19:27:04 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 1Xpi3q-0000O5-46 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 19:27:02 +0100 Original-Received: from localhost ([::1]:41555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi3n-0007H6-JM for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 13:26:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi33-0006jv-5E for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:26:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpi2v-0006oa-Mf for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:26:13 -0500 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:40278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi2j-0006lk-Mk; Sat, 15 Nov 2014 13:25:53 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 80DD61C39D6; Sun, 16 Nov 2014 03:25:52 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 58E891A2844; Sun, 16 Nov 2014 03:25:52 +0900 (JST) In-Reply-To: <87egt4mm4j.fsf@fencepost.gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" acf1c26e3019 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:177225 Archived-At: David Kastrup writes: > 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. Ah, I see, now. For this purpose the content of HEAD is (usually) another ref, and the reflog for HEAD is different from the reflog for the ref it contains. (I wouldn't call that the "reflog of the whole repository", though.) I still don't have a problem with @ = HEAD in contexts where a ref is expected. It's not uncommon for X to mean something different from XX, so it's OK that @{1} != @@{1} for me.