Skip to content

Commit

Permalink
Convert some "apply --summary" users to "diff --summary".
Browse files Browse the repository at this point in the history
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Sean authored and Junio C Hamano committed May 14, 2006
1 parent 4bbd261 commit 9d76812
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion git-format-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'');;
Expand Down
3 changes: 1 addition & 2 deletions git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion git-request-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9d76812

Please sign in to comment.