Merge branch 'bs/stdio-undef-before-redef'

diff --git a/contrib/examples/git-whatchanged.sh b/contrib/examples/git-whatchanged.sh
index 1fb9feb34849f5030d0b9dc7f91ae65e22322786..2edbdc6d998806cbffb880e6d29d5f48b5905145 100755 (executable)
--- a/contrib/examples/git-whatchanged.sh
+++ b/contrib/examples/git-whatchanged.sh
@@ -9,12 +9,12 @@ case "$0" in
 *whatchanged)
        count=
        test -z "$diff_tree_flags" &&
-               diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
+               diff_tree_flags=$(git config --get whatchanged.difftree)
        diff_tree_default_flags='-c -M --abbrev' ;;
 *show)
        count=-n1
        test -z "$diff_tree_flags" &&
-               diff_tree_flags=$(git-repo-config --get show.difftree)
+               diff_tree_flags=$(git config --get show.difftree)
        diff_tree_default_flags='--cc --always' ;;
 esac
 test -z "$diff_tree_flags" &&