apply: get rid of --index-info in favor of --build-fake-ancestor

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 5b794f439990e3ddeb80adee31de44063ef44ee6..a592b61e2fe998525d0978547b3ea7e4ad2d72ac 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -142,7 +142,7 @@ FILES
 If not set explicitly with '--file', there are three files where
 git-config will search for configuration options:
 
-.git/config::
+$GIT_DIR/config::
        Repository specific configuration file. (The filename is
        of course relative to the repository root, not the working
        directory.)