Skip to content

Commit

Permalink
git-merge: Don't use -p when outputting summary
Browse files Browse the repository at this point in the history
-p is not needed and we only want diffstat and summary.

Signed-off-by: Timo Hirvonen <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
tihirvon authored and Junio C Hamano committed Jun 24, 2006
1 parent cda8ab5 commit 5e7c91d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 5e7c91d

Please sign in to comment.