diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-24 00:45:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-23 22:49:41 -0700 |
| commit | 5e7c91d6f744dbf9a18152d2d49057aa3dd06160 (patch) | |
| tree | bbde6f532bc28952b6991f7ccbff67d3672f25aa | |
| parent | cda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff) | |
| download | git-5e7c91d6f744dbf9a18152d2d49057aa3dd06160.tar.gz | |
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>
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |