git-merge: fix faulty SQUASH_MSG
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:41 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
Only the first 'remote' head is currently specified as an argument to 'git
log' when generating a SQUSH_MSG, which makes the generated message fail
to mention every commit involved in the merge. This fixes the problem.

Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge.sh
index cde09d4d602811b610e0d744f4e8ede6f9fb0a39..919e6be4b016dd9835a85ebabd1c5f7d86053ae6 100755 (executable)
@@ -59,7 +59,7 @@ finish_up_to_date () {
 squash_message () {
        echo Squashed commit of the following:
        echo
-       git log --no-merges ^"$head" $remote
+       git log --no-merges ^"$head" $remoteheads
 }
 
 finish () {