path: root/
diff options
authorShawn O. Pearce <>2006-12-23 08:44:47 (GMT)
committerJunio C Hamano <>2006-12-23 09:29:37 (GMT)
commite0ec18192db8a5f80705a81dfaa1caa3e6c48c1a (patch)
tree66bba834a3c73b3c10f916578da0fbd71b9a8f50 /
parentd9606e85cdf26b738786b5e5289bf8335656e95e (diff)
Display 'theirs' branch name when possible in merge.
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 <<<<<<< HEAD:INSTALL Good! ======= Oops. >>>>>>> sideb~1:INSTALL [jc: adjusted a test script and a minor constness glitch.] Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 2 insertions, 0 deletions
diff --git a/ b/
index aec215e..7dd0a11 100755
--- a/
+++ b/
@@ -221,6 +221,8 @@ do
remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
die "$remote - not something we can merge"
remoteheads="${remoteheads}$remotehead "
+ eval GITHEAD_$remotehead='"$remote"'
+ export GITHEAD_$remotehead
set x $remoteheads ; shift