commit | c1e5ca90dba834246e1fbac1c3ce9899873c22a5 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Aug 12 14:09:54 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Aug 12 14:09:55 2015 -0700 |
tree | f4ebff73bd2063559ddd28a4551414a82f5dd5c2 | |
parent | 71cc60070f9d41765e58468e467352d2f008abfb [diff] | |
parent | 114ff8881ac3de4b97f62f014560c99bed5dab92 [diff] |
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"