X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;fp=git-merge.sh;h=d25ae4b82d4208216bb7ce5b5d414ee8b2797865;hb=9954f5b876abb6118f9bdf1d113239d86acca7bd;hp=a221daa7f4882892b29b19b156dfc31986fc8912;hpb=0a8b4def9ae9e929a3310b536782a80a7c7644e7;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index a221daa7..d25ae4b8 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -97,11 +97,14 @@ head=$(git-rev-parse --verify "$1"^0) || usage
 shift
 
 # All the rest are remote heads
+remoteheads=
 for remote
 do
-	git-rev-parse --verify "$remote"^0 >/dev/null ||
+	remotehead=$(git-rev-parse --verify "$remote"^0) ||
 	    die "$remote - not something we can merge"
+	remoteheads="${remoteheads}$remotehead "
 done
+set x $remoteheads ; shift
 
 case "$#" in
 1)