Skip to content

Commit b07244f

Browse files
mhaggergitster
authored andcommitted
Documentation/git-worktree: wordsmith worktree-related manpages
[es: reword .git/worktrees and .git/worktrees/<id>/locked descriptions] Signed-off-by: Michael Haggerty <[email protected]> Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fe819b4 commit b07244f

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

Documentation/config.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,10 +1231,11 @@ gc.pruneexpire::
12311231

12321232
gc.pruneworktreesexpire::
12331233
When 'git gc' is run, it will call
1234+
When 'git gc' is run, it calls
12341235
'git worktree prune --expire 3.months.ago'.
1235-
Override the grace period with this config variable. The value
1236-
"now" may be used to disable the grace period and prune
1237-
$GIT_DIR/worktrees immediately.
1236+
This config variable can be used to set a different grace
1237+
period. The value "now" may be used to disable the grace
1238+
period and prune $GIT_DIR/worktrees immediately.
12381239

12391240
gc.reflogexpire::
12401241
gc.<pattern>.reflogexpire::

Documentation/gitrepository-layout.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,25 +251,25 @@ modules::
251251
Contains the git-repositories of the submodules.
252252

253253
worktrees::
254-
Contains working tree specific information of linked
254+
Contains administrative data for linked
255255
working trees. Each subdirectory contains the working tree-related
256256
part of a linked working tree. This directory is ignored if
257-
$GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/worktrees" will be
258-
used instead.
257+
$GIT_COMMON_DIR is set, in which case
258+
"$GIT_COMMON_DIR/worktrees" will be used instead.
259259

260260
worktrees/<id>/gitdir::
261261
A text file containing the absolute path back to the .git file
262262
that points to here. This is used to check if the linked
263263
repository has been manually removed and there is no need to
264-
keep this directory any more. mtime of this file should be
264+
keep this directory any more. The mtime of this file should be
265265
updated every time the linked repository is accessed.
266266

267267
worktrees/<id>/locked::
268268
If this file exists, the linked working tree may be on a
269-
portable device and not available. It does not mean that the
270-
linked working tree is gone and `worktrees/<id>` could be
271-
removed. The file's content contains a reason string on why
272-
the repository is locked.
269+
portable device and not available. The presence of this file
270+
prevents `worktrees/<id>` from being pruned either automatically
271+
or manually by `git worktree prune`. The file may contain a string
272+
explaining why the repository is locked.
273273

274274
worktrees/<id>/link::
275275
If this file exists, it is a hard link to the linked .git

0 commit comments

Comments
 (0)