git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC] git-mergetool: show original branch names when possible

From
JHJan Hudec <bulb@ucw.cz>
Date
Aug 20, 2007, 18:17 UTC
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:
Show 9 quoted lines
> 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 <bulb@ucw.cz>
Previous: Jeff KingNext: Jeff King
Message 4 of 8 in “[RFC] git-mergetool: show original branch names when possible”
  1. Jeff KingAug 20, 2007
  2. Junio C HamanoAug 20, 2007
  3. Jeff KingAug 20, 2007
  4. Jan HudecAug 20, 2007
  5. Jeff KingAug 21, 2007
  6. Jan HudecAug 21, 2007
  7. Jeff KingAug 21, 2007
  8. Junio C HamanoAug 21, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.