mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 02:04:06 +01:00
Code

git-merge: fix faulty SQUASH_MSG

Browse Source 
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>
This commit is contained in:
Lars Hjemli 2007-09-24 00:51:41 +02:00 committed by Junio C Hamano
parent a85d1b6917
commit 2ae4fd7695
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -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 () {