diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-14 17:12:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 17:12:37 -0700 |
| commit | 5fd51c77faeb362a5429061e595371b7a1c46c02 (patch) | |
| tree | 151c00470194f143f7ae10cb2379f625627253f4 /git-merge.sh | |
| parent | Merge branch 'se/rebase' into next (diff) | |
| parent | Convert some "apply --summary" users to "diff --summary". (diff) | |
| download | tgif-5fd51c77faeb362a5429061e595371b7a1c46c02.tar.xz | |
Merge branch 'se/diff' into next
* se/diff:
Convert some "apply --summary" users to "diff --summary".
Add "--summary" option to git diff.
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 } |