Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-merge: fix faulty SQUASH_MSG
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index cde09d4d602811b610e0d744f4e8ede6f9fb0a39..919e6be4b016dd9835a85ebabd1c5f7d86053ae6 100755
(executable)
--- 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" $remote
heads
}
finish () {