Merge branch 'fg/submodule-non-ascii-path' into maint

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0c3dd1e40c462f44ac26b9bc75d031fd3ba03b3e..8c41881b3707611cb8d708969cd2406147f4799f 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -684,9 +684,7 @@ Git so take care if using Cogito etc.
        The '--git-dir' command-line option also sets this value.
 
 'GIT_WORK_TREE'::
-       Set the path to the working tree.  The value will not be
-       used in combination with repositories found automatically in
-       a .git directory (i.e. $GIT_DIR is not set).
+       Set the path to the root of the working tree.
        This can also be controlled by the '--work-tree' command line
        option and the core.worktree configuration variable.