From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:41:05 +0000 (-0700)
Subject: Merge branch 'cr/git-work-tree-sans-git-dir' into maint
X-Git-Tag: v1.8.3.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/213d25648ae926d523727f1df06ad7ee4d4ad916?hp=ac5611a1ccbbb125b65882711e18331a3b91a1ca

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
---

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0c3dd1e40c..8c41881b37 100644
--- 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.