| commit | 2ae4fd7695abcf2ab36f3fe984cc4ca44559635f | |
| author | Lars Hjemli <hjemli@gmail.com> | |
| Sun, 23 Sep 2007 22:51:41 +0000 (24 00:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2007 00:14:03 +0000 (23 17:14 -0700) | ||
| tree | dfe78ed9228781ffaaa3394cba3412e0cbb90b98 | treesnapshot (tar.gz zip) |
| parent | a85d1b69172f397e815e1ce02db41e4b82b86162 | commitdiff |
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>
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>
| git-merge.sh | diffblobblamehistory |