diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2017-11-29 20:04:50 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:47:35 -0800 |
| commit | 71d6682d8ca9870cbe457cf55c83402c33b41030 (patch) | |
| tree | 23fe7176c9dc953f64acb55d96b852aded935a57 /Documentation/git-worktree.txt | |
| parent | worktree: make add <path> <branch> dwim (diff) | |
| download | tgif-71d6682d8ca9870cbe457cf55c83402c33b41030.tar.xz | |
worktree: add --guess-remote flag to add subcommand
Currently 'git worktree add <path>' creates a new branch named after the
basename of the <path>, that matches the HEAD of whichever worktree we
were on when calling "git worktree add <path>".
It's sometimes useful to have 'git worktree add <path> behave more like
the dwim machinery in 'git checkout <new-branch>', i.e. check if the new
branch name, derived from the basename of the <path>, 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 <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-worktree.txt')
| -rw-r--r-- | Documentation/git-worktree.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 3044d305a6..2a4ea7609f 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -115,6 +115,13 @@ OPTIONS such as configuring sparse-checkout. See "Sparse checkout" in linkgit:git-read-tree[1]. +--[no-]guess-remote:: + With `worktree add <path>`, without `<commit-ish>`, instead + of creating a new branch from HEAD, if there exists a tracking + branch in exactly one remote matching the basename of `<path>, + base the new branch on the remote-tracking branch, and mark + the remote-tracking branch as "upstream" from the new branch. + --[no-]track:: When creating a new branch, if `<commit-ish>` is a branch, mark it as "upstream" from the new branch. This is the |