From: Timo Hirvonen <tihirvon@gmail.com>
Date: Fri, 23 Jun 2006 21:45:40 GMT
Subject: [PATCH 1/5] git-merge: Don't use -p when outputting summary
Message-ID: <20060624004540.3a6705e1.tihirvon@gmail.com>
In-Reply-To: <20060624003315.804a1796.tihirvon@gmail.com>

-p is not needed and we only want diffstat and summary.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
---
 git-merge.sh |    2 +-
 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
 }
-- 
1.4.1.rc1.gf603-dirty