summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 13:57:54 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-19 13:57:54 -0800
commit047135e65db3686c7b168ba029e8545071e5226f (patch)
tree8cb85350a565679c88d6d642189594081b64a38b /config.txt
parent005a1130228687694cfc3f028b25b6eea05dbbb2 (diff)
downloadgit-htmldocs-047135e65db3686c7b168ba029e8545071e5226f.tar.gz
Autogenerated HTML docs for v2.15.1-433-g936d1
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/config.txt b/config.txt
index c1598ee70..b18c0f97f 100644
--- a/config.txt
+++ b/config.txt
@@ -354,6 +354,9 @@ advice.*::
ignoredHook::
Advice shown if an hook is ignored because the hook is not
set as executable.
+ waitingForEditor::
+ Print a message to the terminal whenever Git is waiting for
+ editor input from the user.
--
core.fileMode::
@@ -3468,3 +3471,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.