aboutsummaryrefslogtreecommitdiff
path: root/git-diff.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-14 21:55:23 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-14 21:55:23 -0700
commitafcb536f288f28bb37acf11a5666a219b8f20200 (patch)
tree6069497a703de57e566cdbaa2718ba78e855b3b2 /git-diff.sh
parenta3cc31fb059410d6b96786045947bafc2f32ce60 (diff)
parent84981f9ad963f050abf4fe33ac07d36b4ea90c6d (diff)
downloadgit-afcb536f288f28bb37acf11a5666a219b8f20200.tar.gz
git-afcb536f288f28bb37acf11a5666a219b8f20200.tar.xz
Merge branch 'js/diffstat'
* js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2)
Diffstat (limited to 'git-diff.sh')
-rwxr-xr-xgit-diff.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-diff.sh b/git-diff.sh
index dc0dd312b..0fe677074 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -30,9 +30,11 @@ case " $flags " in
cc_or_p=--cc ;;
esac
-# If we do not have --name-status, --name-only, -r, or -c default to --cc.
+# If we do not have --name-status, --name-only, -r, -c or --stat,
+# default to --cc.
case " $flags " in
-*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* )
+*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* | \
+*" '--stat' "*)
;;
*)
flags="$flags'$cc_or_p' " ;;