Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'lt/grep' into next
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index b834e79c98af51a9f3ad4927a2d11c999349b0e4..af1f25b3c51d197ea5fd24b7623dfb591f867133 100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-55,8
+55,7
@@
finish () {
case "$no_summary" in
'')
- git-diff-tree -p -M "$head" "$1" |
- git-apply --stat --summary
+ git-diff-tree -p --stat --summary -M "$head" "$1"
;;
esac
}