summaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-20 07:29:22 +0200
committerJunio C Hamano <gitster@pobox.com>2015-07-20 20:09:06 +0200
commit114ff8881ac3de4b97f62f014560c99bed5dab92 (patch)
treebd6d8b425ddc0b95febe472ddf8a70a70aceb774 /Documentation/config.txt
parentDocumentation/git-worktree: wordsmith worktree-related manpages (diff)
downloadgit-114ff8881ac3de4b97f62f014560c99bed5dab92.tar.xz
git-114ff8881ac3de4b97f62f014560c99bed5dab92.zip
config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"
As of df0b6cf (worktree: new place for "git prune --worktrees", 2015-06-29), linked worktree pruning functionality moved from "git prune --worktrees" to "git worktree prune". Rename the associated configuration variable accordingly. 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.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0f70cf6141..583d24fda4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1229,8 +1229,7 @@ gc.pruneexpire::
"now" may be used to disable this grace period and always prune
unreachable objects immediately.
-gc.pruneworktreesexpire::
- When 'git gc' is run, it will call
+gc.worktreePruneExpire::
When 'git gc' is run, it calls
'git worktree prune --expire 3.months.ago'.
This config variable can be used to set a different grace