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>
Lars Hjemli committed
Sep 24, 2007 at 00:51 UTC
2ae4fd7695abcf2ab36f3fe984cc4ca44559635f
1 file changed
+1
-1
git-merge.sh
+1
-1
@@ -59,7 +59,7 @@ finish_up_to_date () {
59
squash_message () {
60
echo Squashed commit of the following:
61
echo
62
- git log --no-merges ^"$head" $remote
62
+ git log --no-merges ^"$head" $remoteheads
63
}
64
65
finish () {