diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-23 22:51:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-24 00:14:03 (GMT) |
| commit | 2ae4fd7695abcf2ab36f3fe984cc4ca44559635f (patch) | |
| tree | dfe78ed9228781ffaaa3394cba3412e0cbb90b98 /git-merge.sh | |
| parent | a85d1b69172f397e815e1ce02db41e4b82b86162 (diff) | |
| download | git-2ae4fd7695abcf2ab36f3fe984cc4ca44559635f.zip git-2ae4fd7695abcf2ab36f3fe984cc4ca44559635f.tar.gz git-2ae4fd7695abcf2ab36f3fe984cc4ca44559635f.tar.bz2 | |
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>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 () { |