diff options
author | Thomas Gummerer <t.gummerer@gmail.com> | 2017-11-29 20:04:51 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:47:35 -0800 |
commit | e92445a73173cf21a11b8e79cb7be16485deec69 (patch) | |
tree | f23d5693f2c33306d7f17bea1165d65a602c045a /Documentation | |
parent | 71d6682d8ca9870cbe457cf55c83402c33b41030 (diff) | |
download | git-e92445a73173cf21a11b8e79cb7be16485deec69.tar.gz |
add worktree.guessRemote config option
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 <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config.txt | 10 | ||||
-rw-r--r-- | Documentation/git-worktree.txt | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5f65fa9234..4966d90ebb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3425,3 +3425,13 @@ web.browser:: Specify a web browser that may be used by some commands. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] may use it. + +worktree.guessRemote:: + With `add`, if no branch argument, and neither of `-b` nor + `-B` nor `--detach` are given, the command defaults to + creating a new branch from HEAD. If `worktree.guessRemote` is + set to true, `worktree add` tries to find a remote-tracking + branch whose name uniquely matches the new branch name. If + such a branch exists, it is checked out and set as "upstream" + for the new branch. If no such match can be found, it falls + back to creating a new branch from the current HEAD. diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 2a4ea7609f..f850e8ffb6 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -121,6 +121,9 @@ OPTIONS 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. ++ +This can also be set up as the default behaviour by using the +`worktree.guessRemote` config option. --[no-]track:: When creating a new branch, if `<commit-ish>` is a branch, |