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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Aug 20, 2007 at 08:17:25PM +0200, Jan Hudec wrote:

> > 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.

I considered that, but it has two drawbacks:

  1. It does not handle pulls which have no tracking branch (the only
     ref we have is FETCH_HEAD, which is not a useful name :) ).

  2. In some circumstances, it can come up with counter-intuitive
     names. If more than one ref points to a given commit, then you can
     end up with something like "git-merge foo" telling you all about
     the merge conflicts with "bar". But perhaps that is too obscure a
     corner case to worry about.

-Peff
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux