mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/git-worktree: wordsmith worktree-related manpages

Browse Source 
[es: reword .git/worktrees and .git/worktrees/<id>/locked descriptions]

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2015-07-20 01:29:21 -04:00
committed by Junio C Hamano
parent fe819b4b73
commit b07244f4c3
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/config.txt
View File

@ -1231,10 +1231,11 @@ gc.pruneexpire::
gc.pruneworktreesexpire:: gc.pruneworktreesexpire::
When 'git gc' is run, it will call When 'git gc' is run, it will call
When 'git gc' is run, it calls
'git worktree prune --expire 3.months.ago'. 'git worktree prune --expire 3.months.ago'.
Override the grace period with this config variable. The value This config variable can be used to set a different grace
"now" may be used to disable the grace period and prune period. The value "now" may be used to disable the grace
$GIT_DIR/worktrees immediately. period and prune $GIT_DIR/worktrees immediately.
gc.reflogexpire:: gc.reflogexpire::
gc.<pattern>.reflogexpire:: gc.<pattern>.reflogexpire::

16
Documentation/gitrepository-layout.txt
View File

@ -251,25 +251,25 @@ modules::
Contains the git-repositories of the submodules. Contains the git-repositories of the submodules.
worktrees:: worktrees::
Contains working tree specific information of linked Contains administrative data for linked
working trees. Each subdirectory contains the working tree-related working trees. Each subdirectory contains the working tree-related
part of a linked working tree. This directory is ignored if part of a linked working tree. This directory is ignored if
$GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/worktrees" will be $GIT_COMMON_DIR is set, in which case
used instead. "$GIT_COMMON_DIR/worktrees" will be used instead.
worktrees/<id>/gitdir:: worktrees/<id>/gitdir::
A text file containing the absolute path back to the .git file A text file containing the absolute path back to the .git file
that points to here. This is used to check if the linked that points to here. This is used to check if the linked
repository has been manually removed and there is no need to repository has been manually removed and there is no need to
keep this directory any more. mtime of this file should be keep this directory any more. The mtime of this file should be
updated every time the linked repository is accessed. updated every time the linked repository is accessed.
worktrees/<id>/locked:: worktrees/<id>/locked::
If this file exists, the linked working tree may be on a If this file exists, the linked working tree may be on a
portable device and not available. It does not mean that the portable device and not available. The presence of this file
linked working tree is gone and `worktrees/<id>` could be prevents `worktrees/<id>` from being pruned either automatically
removed. The file's content contains a reason string on why or manually by `git worktree prune`. The file may contain a string
the repository is locked. explaining why the repository is locked.
worktrees/<id>/link:: worktrees/<id>/link::
If this file exists, it is a hard link to the linked .git If this file exists, it is a hard link to the linked .git