Merge branch 'master' into next

diff --git a/git-diff.sh b/git-diff.sh
index dc0dd312bfb83921e1c52849a23ece84a05b5ecd..0fe677074959de444a6c5a273ea816439c6421e0 100755 (executable)
--- 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' " ;;