Merge master into aw/mirror-push

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index c3dffffe3209317fdd228c9a4a1ac89cb1c348f4..a592b61e2fe998525d0978547b3ea7e4ad2d72ac 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -139,10 +139,10 @@ See also <<FILES>>.
 FILES
 -----
 
-If not set explicitely with '--file', there are three files where
+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.)