diff options
| author | Sean <seanlkml@sympatico.ca> | 2006-05-14 12:16:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 23:29:20 (GMT) |
| commit | 9d76812b42009069aa3ff8f29e51b5150aa04e8e (patch) | |
| tree | 4d5edfd6b35b94b1aa08cebc8ee53c28a15be73f | |
| parent | 4bbd261bbd941066735e41dff0ade9f50e6fe84d (diff) | |
| download | git-9d76812b42009069aa3ff8f29e51b5150aa04e8e.zip git-9d76812b42009069aa3ff8f29e51b5150aa04e8e.tar.gz git-9d76812b42009069aa3ff8f29e51b5150aa04e8e.tar.bz2 | |
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>
| -rwxr-xr-x | git-format-patch.sh | 2 | ||||
| -rwxr-xr-x | git-merge.sh | 3 | ||||
| -rwxr-xr-x | git-request-pull.sh | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/git-format-patch.sh b/git-format-patch.sh index c077f44..8a16ead 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -274,7 +274,7 @@ print "\n---\n\n"; close FH or die "close $commsg pipe"; ' "$keep_subject" "$num" "$signoff" "$headers" "$mimemagic" $commsg - git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary + git-diff-tree -p --stat --summary $diff_opts "$commit" echo case "$mimemagic" in '');; diff --git a/git-merge.sh b/git-merge.sh index b834e79..af1f25b 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 } diff --git a/git-request-pull.sh b/git-request-pull.sh index 2c48bfb..4319e35 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -30,4 +30,4 @@ echo " $url" echo git log $baserev..$headrev | git-shortlog ; -git diff $baserev..$headrev | git-apply --stat --summary +git diff --stat --summary $baserev..$headrev |