Documentation/git-worktree: wordsmith worktree-related manpages
[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>
Michael Haggerty committed
Jul 20, 2015 at 01:29 UTC
b07244f4c38326ed6da731aa0d4862905cd58daa
2 files changed
+12
-11
Documentation/config.txt
+4
-3
@@ -1231,10 +1231,11 @@ gc.pruneexpire::
1231
1232
gc.pruneworktreesexpire::
1233
When 'git gc' is run, it will call
1234
+ When 'git gc' is run, it calls
1235
'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.
1239
1240
gc.reflogexpire::
1241
gc.<pattern>.reflogexpire::
Documentation/gitrepository-layout.txt
+8
-8
@@ -251,25 +251,25 @@ modules::
251
Contains the git-repositories of the submodules.
252
253
worktrees::
254
- Contains working tree specific information of linked
254
+ Contains administrative data for linked
255
working trees. Each subdirectory contains the working tree-related
256
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.
259
260
worktrees/<id>/gitdir::
261
A text file containing the absolute path back to the .git file
262
that points to here. This is used to check if the linked
263
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
265
updated every time the linked repository is accessed.
266
267
worktrees/<id>/locked::
268
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.
273
274
worktrees/<id>/link::
275
If this file exists, it is a hard link to the linked .git