Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Change atom, rss actions to use parse_commits.
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index aec215e725826fb18a4d3d75408aa44acdd3e5de..7dd0a112368a8b3672a98fdfcdb5290146cefeba 100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-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
done
set x $remoteheads ; shift