From: Timo Hirvonen <tihirvon@gmail.com>
Date: Fri, 23 Jun 2006 21:45:40 +0000 (+0300)
Subject: git-merge: Don't use -p when outputting summary
X-Git-Tag: v1.4.1-rc2~34^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e7c91d6f744dbf9a18152d2d49057aa3dd06160?ds=inline;hp=--cc

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>
---

5e7c91d6f744dbf9a18152d2d49057aa3dd06160
diff --git a/git-merge.sh b/git-merge.sh
index af1f25b3c5..da5657eb40 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
 }