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 cde09d4..919e6be 100755 --- a/git-merge.sh +++ b/git-merge.sh
@@ -59,7 +59,7 @@ squash_message () { echo Squashed commit of the following: echo - git log --no-merges ^"$head" $remote + git log --no-merges ^"$head" $remoteheads } finish () {