Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:30

Jeff King [off-list ref] writes:
On Tue, Aug 21, 2007 at 04:59:43PM +0200, Jan Hudec wrote:
quoted
quoted
  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 :) ).
If there's no useful name, than it's probably hard to do anything at all
about it. Though FETCH_HEAD is not all that useless -- it at least says it is
that that you pull.
But there _is_ a useful name, it's just not a ref (it's the information
from FETCH_HEAD "branch 'foo' of git://..."). In this case,
git-mergetool could pull it out of FETCH_HEAD, as well, but I feel like
we're starting to make a lot of fragile cross-tool assumptions.
Isn't the label "FETCH_HEAD" itself clear enough, without even
looking at it to see which commit it is?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help