Merge branch 'cr/git-work-tree-sans-git-dir' into maint

* cr/git-work-tree-sans-git-dir: git.txt: remove stale comment regarding GIT_WORK_TREE
git-mirror · Jul 3, 2013 · 213d256 · 213d256
2 parents ac5611a + a758a34
commit 213d256
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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.