summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-03 22:41:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-03 22:41:05 (GMT)
commit213d25648ae926d523727f1df06ad7ee4d4ad916 (patch)
treeda0d14889da25b2db42f93bd6ecee0edac0654a0 /Documentation/git.txt
parentac5611a1ccbbb125b65882711e18331a3b91a1ca (diff)
parenta758a3499ff72111ef5f7066a9f21059c0d63d48 (diff)
downloadgit-213d25648ae926d523727f1df06ad7ee4d4ad916.zip
git-213d25648ae926d523727f1df06ad7ee4d4ad916.tar.gz
git-213d25648ae926d523727f1df06ad7ee4d4ad916.tar.bz2
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
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0c3dd1e..8c41881 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.