Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
log: teach "terminator" vs "separator" mode to "--pretty=format"
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index 03cd39873aef7b7ce00c4c2a826eab867ecc29ac..7dbbb1d79dc1d66db3a662045a13554f8d574004 100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-71,7
+71,7
@@
finish_up_to_date () {
squash_message () {
echo Squashed commit of the following:
echo
- git log --no-merges ^"$head" $remoteheads
+ git log --no-merges
--pretty=medium
^"$head" $remoteheads
}
finish () {