From: Junio C Hamano Date: Fri, 18 Jan 2019 21:49:53 +0000 (-0800) Subject: Merge branch 'es/doc-worktree-guessremote-config' X-Git-Tag: v2.21.0-rc0~96 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/540ee40e11a7b76eec7f9b4c14ab988345dc829e?hp=3942920966b4392c52c09f66dda391d9c330f0f7 Merge branch 'es/doc-worktree-guessremote-config' Doc clarification. * es/doc-worktree-guessremote-config: doc/config: do a better job of introducing 'worktree.guessRemote' --- diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.txt index b853798fc2..048e349482 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