Re: [RFC/PATCH] mergetool: clarify local/remote terminology

From: Jay Soffian <jaysoffian@gmail.com>
Date: Feb 25, 2008, 19:07 UTC
Message-ID: <76718490802251107y44ff2d6ahf5446ae0408c67b0@mail.gmail.com>
In-Reply-To: <20080225184648.GC15131@sigill.intra.peff.net>

On Mon, Feb 25, 2008 at 1:46 PM, Jeff King <peff@peff.net> wrote:

>  I have been annoyed by this in the past, too. And I think your change is
>  probably an improvement (though I haven't tried it yet). As a user, what
>  I would _really_ like to see, though, is simply the branch names:
>  "origin/next" versus "next".

I was playing with that, figuring out branch names in the same way that the code in bashcompletions computes ps1. However, what would you want to see if you're doing an interactive rebase of say HEAD vs HEAD~5. They are both the same branch, so what would you want to see?

Show 20 quoted lines

>  I looked at using the GITHEAD_* mechanism
>  in the past, but that relies on the environment, which can't get
>  directly to mergetool. See this thread:
>
>  http://mid.gmane.org/20070820075318.GA12478@coredump.intra.peff.net
>
>  I think the right thing to do is the oft-discussed-but-never-implemented
>  "what's happening right now" file/command that would say:
>
>   1. there's a rebase happening now
>   2. the upstream branch is X
>   3. the rebased branch is Y
>
>  but that could also of course say
>
>   1. there's a merge happening now
>   2. the first parent is X
>   3. the second parent is Y
>
>  and so on (including "we're in a git-am, git-cherry-pick, etc").

Okay, I'll look into that.

>  I'll try out your patch and comment next time I use it.

Appreciated.

j.