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-format-patch.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-format-patch.sh')
-rwxr-xr-x | git-format-patch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-format-patch.sh b/git-format-patch.sh index c077f44ca1..8a16eadfbd 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 '');; |