From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2015 21:09:54 +0000 (-0700)
Subject: Merge branch 'es/worktree-add'
X-Git-Tag: v2.6.0-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1e5ca90dba834246e1fbac1c3ce9899873c22a5?hp=c1e5ca90dba834246e1fbac1c3ce9899873c22a5

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"
---