aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-24 00:51:41 +0200
committerJunio C Hamano <gitster@pobox.com>2007-09-23 17:14:03 -0700
commit2ae4fd7695abcf2ab36f3fe984cc4ca44559635f (patch)
treedfe78ed9228781ffaaa3394cba3412e0cbb90b98
parenta85d1b69172f397e815e1ce02db41e4b82b86162 (diff)
downloadgit-2ae4fd7695abcf2ab36f3fe984cc4ca44559635f.tar.gz
git-2ae4fd7695abcf2ab36f3fe984cc4ca44559635f.tar.xz
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>
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
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 () {