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
This commit is contained in:
Junio C Hamano 2013-07-03 15:41:05 -07:00
Родитель ac5611a1cc a758a3499f
Коммит 213d25648a
1 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

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