Revert "Documentation: always respect core.worktree if set"
This reverts commit f5e025a9d5b35e24768475f6890b836ce0d5ed15. The commit reflected what the code did. But the code did that because it had bugs. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Nov 26, 2010 at 22:32 UTC
98acf75985d15e8c53f1dfa1721b1e1128101737
1 file changed
+8
-15
Documentation/config.txt
+8
-15
@@ -317,24 +317,17 @@ false), while all other repositories are assumed to be bare (bare
317
= true).
318
319
core.worktree::
320
- Set the path to the root of the work tree.
320
+ Set the path to the working tree. The value will not be
321
+ used in combination with repositories found automatically in
322
+ a .git directory (i.e. $GIT_DIR is not set).
323
This can be overridden by the GIT_WORK_TREE environment
324
variable and the '--work-tree' command line option. It can be
323
- an absolute path or a relative path to the .git directory,
324
- either specified by --git-dir or GIT_DIR, or automatically
325
- discovered.
326
- If --git-dir or GIT_DIR are specified but none of
325
+ an absolute path or relative path to the directory specified by
326
+ --git-dir or GIT_DIR.
327
+ Note: If --git-dir or GIT_DIR are specified but none of
328
--work-tree, GIT_WORK_TREE and core.worktree is specified,
328
- the current working directory is regarded as the root of the
329
- work tree.
330
-+
331
-Note that this variable is honored even when set in a configuration
332
-file in a ".git" subdirectory of a directory, and its value differs
333
-from the latter directory (e.g. "/path/to/.git/config" has
334
-core.worktree set to "/different/path"), which is most likely a
335
-misconfiguration. Running git commands in "/path/to" directory will
336
-still use "/different/path" as the root of the work tree and can cause
337
-great confusion to the users.
329
+ the current working directory is regarded as the top directory
330
+ of your working tree.
331
332
core.logAllRefUpdates::
333
Enable the reflog. Updates to a ref <ref> is logged to the file