summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-12 21:09:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-12 21:09:55 (GMT)
commitc1e5ca90dba834246e1fbac1c3ce9899873c22a5 (patch)
treef4ebff73bd2063559ddd28a4551414a82f5dd5c2 /builtin/gc.c
parent71cc60070f9d41765e58468e467352d2f008abfb (diff)
parent114ff8881ac3de4b97f62f014560c99bed5dab92 (diff)
downloadgit-c1e5ca90dba834246e1fbac1c3ce9899873c22a5.zip
git-c1e5ca90dba834246e1fbac1c3ce9899873c22a5.tar.gz
git-c1e5ca90dba834246e1fbac1c3ce9899873c22a5.tar.bz2
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 'builtin/gc.c')
-rw-r--r--builtin/gc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 4957c39..bcc75d9 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -85,7 +85,7 @@ static void gc_config(void)
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
git_config_get_bool("gc.autodetach", &detach_auto);
git_config_date_string("gc.pruneexpire", &prune_expire);
- git_config_date_string("gc.pruneworktreesexpire", &prune_worktrees_expire);
+ git_config_date_string("gc.worktreepruneexpire", &prune_worktrees_expire);
git_config(git_default_config, NULL);
}