From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 23 Sep 2007 22:51:41 +0000 (+0200)
Subject: git-merge: fix faulty SQUASH_MSG
X-Git-Tag: v1.5.4-rc0~388^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ae4fd7695abcf2ab36f3fe984cc4ca44559635f;p=git.git

git-merge: fix faulty SQUASH_MSG

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>
---

diff --git a/git-merge.sh b/git-merge.sh
index cde09d4d6..919e6be4b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -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 () {