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

Merge branch 'tg/worktree-add-existing-branch'

2018-05-23T05:38:18Z

"git worktree add" learned to check out an existing branch. * tg/worktree-add-existing-branch: worktree: teach "add" to check out existing branches worktree: factor out dwim_branch function worktree: improve message when creating a new worktree worktree: remove extra members from struct add_opts

Merge branch 'sb/worktree-remove-opt-force'

2018-05-08T06:59:24Z

"git worktree remove" learned that "-f" is a shorthand for "--force" option, just like for "git worktree add". * sb/worktree-remove-opt-force: worktree: accept -f as short for --force for removal

worktree: teach "add" to check out existing branches

2018-04-30T00:06:34Z

Currently 'git worktree add ' creates a new branch named after the basename of the path by default. If a branch with that name already exists, the command refuses to do anything, unless the '--force' option is given. However we can do a little better than that, and check the branch out if it is not checked out anywhere else. This will help users who just want to check an existing branch out into a new worktree, and save a few keystrokes. As the current behaviour is to simply 'die()' when a branch with the name of the basename of the path already exists, there are no backwards compatibility worries here. We will still 'die()' if the branch is checked out in another worktree, unless the --force flag is passed. Helped-by: Eric Sunshine Signed-off-by: Thomas Gummerer Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'es/worktree-docs'

2018-04-25T04:29:02Z

Doc updates. * es/worktree-docs: git-worktree.txt: unify command-line prompt in example blocks git-worktree.txt: recommend 'git worktree remove' over manual deletion

worktree: accept -f as short for --force for removal

2018-04-18T00:19:05Z

Many commands support a "--force" option, frequently abbreviated as "-f", however, "git worktree remove"'s hand-rolled OPT_BOOL forgets to recognize the short form, despite git-worktree.txt documenting "-f" as supported. Replace OPT_BOOL with OPT__FORCE, which provides "-f" for free, and makes 'remove' consistent with 'add' option parsing (which also specifies the PARSE_OPT_NOCOMPLETE flag). Helped-by: Eric Sunshine Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

git-worktree.txt: unify command-line prompt in example blocks

2018-04-09T09:49:24Z

The command-line prompt in the "EXAMPLES" section is "$", however, examples in the 'git worktree list' section (oddly) use "S" as a prompt. Fix this inconsistency by settling on "$" as prompt in all examples. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

git-worktree.txt: recommend 'git worktree remove' over manual deletion

2018-04-09T09:49:22Z

When cc73385cf6 (worktree remove: new command, 2018-02-12) implemented and documented 'git worktree remove', it forgot to update existing instructions suggesting manual deletion. Fix this oversight by recommending 'git worktree remove' instead. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-move'

2018-03-14T19:01:05Z

"git worktree" learned move and remove subcommands. * nd/worktree-move: t2028: fix minor error and issues in newly-added "worktree move" tests worktree remove: allow it when $GIT_WORK_TREE is already gone worktree remove: new command worktree move: refuse to move worktrees with submodules worktree move: accept destination as directory worktree move: new command worktree.c: add update_worktree_location() worktree.c: add validate_worktree()

git-worktree.txt: fix indentation of example and text of 'add' command

2018-02-16T21:12:27Z

When 4e85333197 (worktree: make add dwim, 2017-11-26) added an example command in a literal code block, it neglected to insert a mandatory "+" line before the block. This omission resulted in both the literal code block and the (existing) paragraph following the block to be outdented, even though they should be indented under the 'add' sub-command along with the rest of the text pertaining to that command. Furthermore, the mandatory "+" line separating the code block from the following text got rendered as a leading character on the line ("+ If ...") rather than being treated as a formatting directive. Fix these problems by adding the missing "+" line before the example code block. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

git-worktree.txt: fix missing ")" typo

2018-02-16T21:11:40Z

Add the closing ")" to a parenthetical phrase introduced by 4e85333197 (worktree: make add dwim, 2017-11-26). While at it, add a missing ":" at the end of the same sentence since it precedes an example literal command block. Reported-by: Mike Nordell Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano