From: Lars Hjemli Date: Sun, 23 Sep 2007 22:51:41 GMT Subject: [PATCH 2/6] git-merge: fix faulty SQUASH_MSG Message-ID: <1190587905-700-3-git-send-email-hjemli@gmail.com> In-Reply-To: <1190587905-700-2-git-send-email-hjemli@gmail.com> 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 Signed-off-by: Lars Hjemli --- git-merge.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 3a01db0..3857634 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 () { -- 1.5.3.2.82.g75c8d