diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-24 00:51:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:14:03 -0700 |
| commit | 2ae4fd7695abcf2ab36f3fe984cc4ca44559635f (patch) | |
| tree | dfe78ed9228781ffaaa3394cba3412e0cbb90b98 /convert-objects.c | |
| parent | a85d1b69172f397e815e1ce02db41e4b82b86162 (diff) | |
| download | git-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>
Diffstat (limited to 'convert-objects.c')
0 files changed, 0 insertions, 0 deletions