summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-07-20 01:29:21 -0400
committerJunio C Hamano <gitster@pobox.com>2015-07-20 11:07:18 -0700
commitb07244f4c38326ed6da731aa0d4862905cd58daa (patch)
tree8b19b9d66364528acd7990d49f622edc0ade675c /Documentation/config.txt
parentfe819b4b73e82654f5827d208acfdeeb2a40b8ca (diff)
downloadgit-b07244f4c38326ed6da731aa0d4862905cd58daa.tar.gz
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>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b56c2eb2a8..0f70cf6141 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1231,10 +1231,11 @@ gc.pruneexpire::
gc.pruneworktreesexpire::
When 'git gc' is run, it will call
+ When 'git gc' is run, it calls
'git worktree prune --expire 3.months.ago'.
- Override the grace period with this config variable. The value
- "now" may be used to disable the grace period and prune
- $GIT_DIR/worktrees immediately.
+ This config variable can be used to set a different grace
+ period. The value "now" may be used to disable the grace
+ period and prune $GIT_DIR/worktrees immediately.
gc.reflogexpire::
gc.<pattern>.reflogexpire::