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

Documentation/git-worktree.txt: add missing `

2018-01-11T20:19:40Z

Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

add worktree.guessRemote config option

2017-12-06T17:47:35Z

Some users might want to have the --guess-remote option introduced in the previous commit on by default, so they don't have to type it out every time they create a new worktree. Add a config option worktree.guessRemote that allows users to configure the default behaviour for themselves. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

worktree: add --guess-remote flag to add subcommand

2017-12-06T17:47:35Z

Currently 'git worktree add ' creates a new branch named after the basename of the , that matches the HEAD of whichever worktree we were on when calling "git worktree add ". It's sometimes useful to have 'git worktree add behave more like the dwim machinery in 'git checkout ', i.e. check if the new branch name, derived from the basename of the , uniquely matches the branch name of a remote-tracking branch, and if so check out that branch and set the upstream to the remote-tracking branch. Add a new --guess-remote option that enables exactly that behaviour. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

worktree: make add dwim

2017-11-27T00:48:06Z

Currently 'git worktree add ', errors out when 'branch' is not a local branch. It has no additional dwim'ing features that one might expect. Make it behave more like 'git checkout ' when the branch doesn't exist locally, but a remote tracking branch uniquely matches the desired branch name, i.e. create a new branch from the remote tracking branch and set the upstream to the remote tracking branch. As 'git worktree add' currently just dies in this situation, there are no backwards compatibility worries when introducing this feature. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

worktree: add --[no-]track option to the add subcommand

2017-11-27T00:48:06Z

Currently 'git worktree add' sets up tracking branches if '' is a remote tracking branch, and doesn't set them up otherwise, as is the default for 'git branch'. This may or may not be what the user wants. Allow overriding this behaviour with a --[no-]track flag that gets passed through to 'git branch'. We already respect branch.autoSetupMerge, as 'git worktree' just calls 'git branch' internally. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

worktree: add can be created from any commit-ish

2017-11-27T00:48:06Z

Currently 'git worktree add' is documented to take an optional argument, which is checked out in the new worktree. However it is more generally possible to use a commit-ish as the optional argument, and check that out into the new worktree. Document that this is a possibility, as new users of git worktree add might find it helpful. Reported-by: Randall S. Becker Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

worktree add: add --lock option

2017-04-21T00:59:02Z

As explained in the document. This option has an advantage over the command sequence "git worktree add && git worktree lock": there will be no gap that somebody can accidentally "prune" the new worktree (or soon, explicitly "worktree remove" it). "worktree add" does keep a lock on while it's preparing the worktree. If --lock is specified, this lock remains after the worktree is created. Suggested-by: David Taylor Signed-off-by: Nguyễn Thái Ngọc Duy Helped-by: Jeff King Signed-off-by: Junio C Hamano

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