X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-whatchanged.sh;h=d4f985b5eb2f64e597e820c04e510f0f81692a6a;hb=d366c7037679794edff38cdbc422997607aca5f1;hp=85a49fcd8e7754cc37960c997a200b61c85892b4;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git

diff --git a/git-whatchanged.sh b/git-whatchanged.sh
index 85a49fcd..d4f985b5 100755
--- a/git-whatchanged.sh
+++ b/git-whatchanged.sh
@@ -1,7 +1,18 @@
 #!/bin/sh
+
+USAGE='[-p] [--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [-m] [git-diff-tree options] [git-rev-list options]'
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
+diff_tree_flags=$(git-rev-parse --sq --no-revs --flags "$@") || exit
+test -z "$diff_tree_flags" &&
+	diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
+test -z "$diff_tree_flags" &&
+	diff_tree_flags='-M --abbrev'
+
 rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") &&
-diff_tree_args=$(git-rev-parse --sq --no-revs "$@") &&
+diff_tree_args=$(git-rev-parse --sq --no-revs --no-flags "$@") &&
 
 eval "git-rev-list $rev_list_args" |
-eval "git-diff-tree --stdin --pretty -r $diff_tree_args" |
+eval "git-diff-tree --stdin --pretty -r $diff_tree_flags $diff_tree_args" |
 LESS="$LESS -S" ${PAGER:-less}