Merge branch 'es/doc-worktree-guessremote-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:53 +0000 (13:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:53 +0000 (13:49 -0800)
Doc clarification.

* es/doc-worktree-guessremote-config:
doc/config: do a better job of introducing 'worktree.guessRemote'

Documentation/config/worktree.txt
index b853798fc2b159b13923be63f4068064f04579ce..048e349482df6c892055720eb53cdcd6c327b6ed 100644 (file)
@@ -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