projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a85d1b6) | patch
git-merge: fix faulty SQUASH_MSG
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:41 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
commit2ae4fd7695abcf2ab36f3fe984cc4ca44559635f
treedfe78ed9228781ffaaa3394cba3412e0cbb90b98tree | snapshot
parenta85d1b69172f397e815e1ce02db41e4b82b86162commit | diff
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>
git-merge.sh diff | blob | history
Git—the stupid content tracker