Merge branch 'maint'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index ed37141b6e5afd8294c5961a1ab96c634a5f4a82..3d85ceaae9e695d7b03d09cb082f1eef4f8406f2 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -73,7 +73,7 @@ test_expect_success setup '
        for i in 1 2; do echo $i; done >>dir/sub &&
        git update-index file0 dir/sub &&
 
-       git repo-config log.showroot false &&
+       git config log.showroot false &&
        git commit --amend &&
        git show-branch
 '