diff options
| author | Sean <seanlkml@sympatico.ca> | 2006-05-14 16:16:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 03:29:20 +0400 |
| commit | 9d76812b42009069aa3ff8f29e51b5150aa04e8e (patch) | |
| tree | 4d5edfd6b35b94b1aa08cebc8ee53c28a15be73f /git-merge.sh | |
| parent | 4bbd261bbd941066735e41dff0ade9f50e6fe84d (diff) | |
Convert some "apply --summary" users to "diff --summary".
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index b834e79c98..af1f25b3c5 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -55,8 +55,7 @@ finish () { case "$no_summary" in '') - git-diff-tree -p -M "$head" "$1" | - git-apply --stat --summary + git-diff-tree -p --stat --summary -M "$head" "$1" ;; esac } |