Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index be9672e5a0222f0a796f400b2c22c615fff195a4..0c9ec0ad44ef4e3239e67a0c9e9ecc1340dcee8a 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -431,6 +431,7 @@ test_expect_success 'detach a symbolic link HEAD' '
 
 test_expect_success \
     'checkout with --track fakes a sensible -b <name>' '
+    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
     git update-ref refs/remotes/origin/koala/bear renamer &&
 
     git checkout --track origin/koala/bear &&