aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSean <seanlkml@sympatico.ca>2006-05-14 08:16:06 -0400
committerJunio C Hamano <junkio@cox.net>2006-05-14 16:29:20 -0700
commit9d76812b42009069aa3ff8f29e51b5150aa04e8e (patch)
tree4d5edfd6b35b94b1aa08cebc8ee53c28a15be73f /git-merge.sh
parent4bbd261bbd941066735e41dff0ade9f50e6fe84d (diff)
downloadgit-9d76812b42009069aa3ff8f29e51b5150aa04e8e.tar.gz
git-9d76812b42009069aa3ff8f29e51b5150aa04e8e.tar.xz
Convert some "apply --summary" users to "diff --summary".
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh
index b834e79c9..af1f25b3c 100755
--- 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
}