Re: [PATCH 2/2] Display 'theirs' branch name when possible in merge.

From: Jakub Narebski <jnareb@gmail.com>
Date: Dec 23, 2006, 09:11 UTC
Message-ID: <emirms$kh3$1@sea.gmane.org>
In-Reply-To: <20061223084447.GB10203@spearce.org>

Shawn O. Pearce wrote:

Show 16 quoted lines

> Displaying the SHA1 of 'their' branch (the branch being merged into
> the current branch) is not nearly as friendly as just displaying
> the name of that branch, especially if that branch is already local
> to this repository.
> 
> git-merge now sets the environment variable 'GITHEAD_%(sha1)=%(name)'
> for each argument it gets passed, making the actual input name that
> resolved to the commit '%(sha1)' easily available to the invoked
> merge strategy.
> 
> git-merge-recursive makes use of these environment variables when
> they are available by using '%(name)' whenever it outputs the commit
> identification rather than '%(sha1)'.  This is most obvious in the
> conflict hunks created by xdl_merge:
> 
>   $ git mege sideb~1

      git merge sideb~1

Show 5 quoted lines

>   <<<<<<< HEAD:INSTALL
>      Good!
>   =======
>      Oops.
>   >>>>>>> sideb~1:INSTALL

Very nice. Thanks.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git