summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorTimo Hirvonen <tihirvon@gmail.com>2006-06-23 21:45:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-24 05:49:41 (GMT)
commit5e7c91d6f744dbf9a18152d2d49057aa3dd06160 (patch)
treebbde6f532bc28952b6991f7ccbff67d3672f25aa /git-merge.sh
parentcda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff)
downloadgit-5e7c91d6f744dbf9a18152d2d49057aa3dd06160.zip
git-5e7c91d6f744dbf9a18152d2d49057aa3dd06160.tar.gz
git-5e7c91d6f744dbf9a18152d2d49057aa3dd06160.tar.bz2
git-merge: Don't use -p when outputting summary
-p is not needed and we only want diffstat and summary. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index af1f25b..da5657e 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,7 +55,7 @@ finish () {
case "$no_summary" in
'')
- git-diff-tree -p --stat --summary -M "$head" "$1"
+ git-diff-tree --stat --summary -M "$head" "$1"
;;
esac
}