git/Documentation/git-worktree.txt, branch v2.12.2

Merge branch 'bc/worktree-doc-fix-detached'

2017-02-24T18:48:10Z

Doc update. * bc/worktree-doc-fix-detached: Documentation: correctly spell git worktree --detach

Documentation: correctly spell git worktree --detach

2017-02-22T18:08:38Z

The option is “--detach”, but we accidentally spelled it “--detached” at one point in the man page. Signed-off-by: brian m. carlson Reported-by: Casey Rodarmor Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-lock'

2016-11-17T21:45:21Z

Typofix. * nd/worktree-lock: git-worktree.txt: fix typo "to"/"two", and add comma

git-worktree.txt: fix typo "to"/"two", and add comma

2016-11-14T01:56:56Z

Signed-off-by: Ben North Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-lock'

2016-07-28T17:34:42Z

"git worktree prune" protected worktrees that are marked as "locked" by creating a file in a known location. "git worktree" command learned a dedicated command pair to create and remove such a file, so that the users do not have to do this with editor. * nd/worktree-lock: worktree.c: find_worktree() search by path suffix worktree: add "unlock" command worktree: add "lock" command worktree.c: add is_worktree_locked() worktree.c: add is_main_worktree() worktree.c: add find_worktree()

worktree.c: find_worktree() search by path suffix

2016-07-08T22:31:04Z

This allows the user to do something like "worktree lock foo" or "worktree lock to/foo" instead of "worktree lock /long/path/to/foo" if it's unambiguous. With completion support it could be quite convenient. While this base name search can be done in the same worktree iteration loop, the code is split into a separate function for clarity. Suggested-by: Eric Sunshine Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

worktree: add "unlock" command

2016-07-08T22:31:04Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

worktree: add "lock" command

2016-07-08T22:31:04Z

Helped-by: Eric Sunshine Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-cleanup-post-head-protection'

2016-07-06T20:38:11Z

Further preparatory clean-up for "worktree" feature continues. * nd/worktree-cleanup-post-head-protection: worktree: simplify prefixing paths worktree: avoid 0{40}, too many zeroes, hard to read worktree.c: use is_dot_or_dotdot() git-worktree.txt: keep subcommand listing in alphabetical order worktree.c: rewrite mark_current_worktree() to avoid strbuf completion: support git-worktree

worktree: allow "-" short-hand for @{-1} in add command

2016-05-31T19:28:25Z

Since `git worktree add` uses `git checkout` when `[]` is used, and `git checkout -` is already supported, it makes sense to allow the same shortcut in `git worktree add`. Signed-off-by: Jordan DE GEA Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano