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

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

c1e5ca90dba834246e1fbac1c3ce9899873c22a5
diff --cc Documentation/config.txt
index 315f2710af,583d24fda4..da74ad0d0a
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1302,15 -1229,15 +1302,15 @@@ gc.pruneExpire:
  	"now" may be used to disable this  grace period and always prune
  	unreachable objects immediately.
  
- gc.pruneWorktreesExpire::
- 	When 'git gc' is run, it will call
- 	'prune --worktrees --expire 3.months.ago'.
- 	Override the grace period with this config variable. The value
- 	"now" may be used to disable the grace period and prune
- 	$GIT_DIR/worktrees immediately.
+ gc.worktreePruneExpire::
+ 	When 'git gc' is run, it calls
+ 	'git worktree prune --expire 3.months.ago'.
+ 	This config variable can be used to set a different grace
+ 	period. The value "now" may be used to disable the grace
+ 	period and prune $GIT_DIR/worktrees immediately.
  
 -gc.reflogexpire::
 -gc.<pattern>.reflogexpire::
 +gc.reflogExpire::
 +gc.<pattern>.reflogExpire::
  	'git reflog expire' removes reflog entries older than
  	this time; defaults to 90 days.  With "<pattern>" (e.g.
  	"refs/stash") in the middle the setting applies only to