Merge branch 'es/worktree-add'
commitc1e5ca90dba834246e1fbac1c3ce9899873c22a5
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2015 21:09:54 +0000 (12 14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2015 21:09:55 +0000 (12 14:09 -0700)
treef4ebff73bd2063559ddd28a4551414a82f5dd5c2
parent71cc60070f9d41765e58468e467352d2f008abfb
parent114ff8881ac3de4b97f62f014560c99bed5dab92
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"
Documentation/config.txt
builtin/gc.c