summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2015-07-20 01:29:22 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-20 11:09:06 -0700
commit114ff8881ac3de4b97f62f014560c99bed5dab92 (patch)
treebd6d8b425ddc0b95febe472ddf8a70a70aceb774 /t/t6037-merge-ours-theirs.sh
parentDocumentation/git-worktree: wordsmith worktree-related manpages (diff)
downloadtgif-114ff8881ac3de4b97f62f014560c99bed5dab92.tar.xz
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 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions