delta/git.git/Documentation/git-worktree.txt, branch sb/pathspec-errors

Merge branch 'nd/worktree-lock'

2016-11-17T21:45:21+00:00

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:56+00:00

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

Merge branch 'nd/worktree-lock'

2016-07-28T17:34:42+00:00

"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:04+00:00

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:04+00:00

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

worktree: add "lock" command

2016-07-08T22:31:04+00:00

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:11+00:00

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:25+00:00

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

git-worktree.txt: keep subcommand listing in alphabetical order

2016-05-24T20:19:22+00:00

This is probably not the best order. But it makes it no-brainer to know
where to insert new commands. At some point we might want to reorder at
least the synopsis part again, grouping commonly use subcommands together.

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

worktree: add: introduce --checkout option

2016-03-29T18:12:36+00:00

By adding this option which defaults to true, we can use the
corresponding --no-checkout to make some customizations before
the checkout, like sparse checkout, etc.

Helped-by: Eric Sunshine 
Helped-by: Junio C Hamano 
Reviewed-by: Eric Sunshine 
Signed-off-by: Ray Zhang 
Signed-off-by: Junio C Hamano