summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
commit540ee40e11a7b76eec7f9b4c14ab988345dc829e (patch)
tree13b2f1c5c4647085af2894a023f6c8c12ecb96bf
parent3942920966b4392c52c09f66dda391d9c330f0f7 (diff)
parentb4583d55956544f936ba35893374e49a184bd7c9 (diff)
downloadgit-540ee40e11a7b76eec7f9b4c14ab988345dc829e.zip
git-540ee40e11a7b76eec7f9b4c14ab988345dc829e.tar.gz
git-540ee40e11a7b76eec7f9b4c14ab988345dc829e.tar.bz2
Merge branch 'es/doc-worktree-guessremote-config'
Doc clarification. * es/doc-worktree-guessremote-config: doc/config: do a better job of introducing 'worktree.guessRemote'
-rw-r--r--Documentation/config/worktree.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.txt
index b853798..048e349 100644
--- a/Documentation/config/worktree.txt
+++ b/Documentation/config/worktree.txt
@@ -1,6 +1,6 @@
worktree.guessRemote::
- With `add`, if no branch argument, and neither of `-b` nor
- `-B` nor `--detach` are given, the command defaults to
+ If no branch is specified and neither `-b` nor `-B` nor
+ `--detach` is used, then `git worktree add` 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