@matheusbsbs / matheus-bagliano / commits / 5e7c91d6f7
Fork 0

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>

Timo Hirvonen committed Jun 24, 2006 at 00:45 UTC 5e7c91d6f744dbf9a18152d2d49057aa3dd06160
1 file changed +1 -1
git-merge.sh
+1 -1
@@ -55,7 +55,7 @@ finish () {
55
56 case "$no_summary" in
57 '')
58 - git-diff-tree -p --stat --summary -M "$head" "$1"
58 + git-diff-tree --stat --summary -M "$head" "$1"
59 ;;
60 esac
61 }