From: Jan Hudec Date: Mon, 20 Aug 2007 18:17:25 GMT Subject: Re: [RFC] git-mergetool: show original branch names when possible Message-ID: <20070820181725.GB8542@efreet.light.src> In-Reply-To: <20070820085246.GA23764@coredump.intra.peff.net> On Mon, Aug 20, 2007 at 04:52:47 -0400, Jeff King wrote: > On Mon, Aug 20, 2007 at 01:28:31AM -0700, Junio C Hamano wrote: > > > 2. It looks like doing an anonymous 'git-pull' leaves GITHEAD_* as the > > > commit sha1, which means you will end up with that sha1 rather than > > > 'REMOTE', which is less nice than the current behavior. > > > > Much less nice indeed. > > I think this is a failing of git-merge, though, for not including that > nice human-readable information. We can fix it with something like this: Maybe you could call git-name-rev on it if it does not come with a human-readable name. -- Jan 'Bulb' Hudec