diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:55 -0700 |
| commit | c1e5ca90dba834246e1fbac1c3ce9899873c22a5 (patch) | |
| tree | f4ebff73bd2063559ddd28a4551414a82f5dd5c2 /Documentation/config.txt | |
| parent | 71cc60070f9d41765e58468e467352d2f008abfb (diff) | |
| parent | 114ff8881ac3de4b97f62f014560c99bed5dab92 (diff) | |
| download | git-c1e5ca90dba834246e1fbac1c3ce9899873c22a5.tar.gz git-c1e5ca90dba834246e1fbac1c3ce9899873c22a5.tar.xz | |
Merge branch 'es/worktree-add'
Remove remaining cruft from "git checkout --to", which
transitioned to "git worktree add".
* es/worktree-add:
config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"
Documentation/git-worktree: wordsmith worktree-related manpages
Documentation/config: fix stale "git prune --worktree" reference
Documentation/git-worktree: fix incorrect reference to file "locked"
Documentation/git-worktree: consistently use term "linked working tree"
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 315f2710a..da74ad0d0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1302,12 +1302,12 @@ 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 - 'prune --worktrees --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. +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 + period. The value "now" may be used to disable the grace + period and prune $GIT_DIR/worktrees immediately. gc.reflogExpire:: gc.<pattern>.reflogExpire:: |