summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 20:31:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-11 20:31:01 (GMT)
commitb1bd929611c729ace6e38a41b01b365469312327 (patch)
tree39e44d5f14f223d983d5ef272a6ea1adc55ee056 /Documentation/git.txt
parentf1e74148fa5a1a7f2127660a648cf5e304bbb59f (diff)
parenta758a3499ff72111ef5f7066a9f21059c0d63d48 (diff)
downloadgit-b1bd929611c729ace6e38a41b01b365469312327.zip
git-b1bd929611c729ace6e38a41b01b365469312327.tar.gz
git-b1bd929611c729ace6e38a41b01b365469312327.tar.bz2
Merge branch 'cr/git-work-tree-sans-git-dir'
These days, "git --work-tree=there cmd" without specifying an explicit --git-dir=here will do the usual discovery, but we had a description of older behaviour in the documentation. * 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 fcbca8d..2e23cbb 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -683,9 +683,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.