From: Jan Hudec <bulb@ucw.cz>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>
Subject: Re: [RFC] git-mergetool: show original branch names when possible
Date: Mon, 20 Aug 2007 20:17:25 +0200 [thread overview]
Message-ID: <20070820181725.GB8542@efreet.light.src> (raw)
In-Reply-To: <20070820085246.GA23764@coredump.intra.peff.net>
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
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 <bulb@ucw.cz>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-08-20 18:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 7:53 [RFC] git-mergetool: show original branch names when possible Jeff King
2007-08-20 8:28 ` Junio C Hamano
2007-08-20 8:52 ` Jeff King
2007-08-20 18:17 ` Jan Hudec [this message]
2007-08-21 6:10 ` Jeff King
2007-08-21 14:59 ` Jan Hudec
2007-08-21 20:55 ` Jeff King
2007-08-21 21:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070820181725.GB8542@efreet.light.src \
--to=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).