From 661a5a382e37c8a81e76ba803559075f3350a51c Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Fri, 16 Feb 2018 15:44:51 -0500 Subject: git-worktree.txt: fix missing ")" typo Add the closing ")" to a parenthetical phrase introduced by 4e85333197 (worktree: make add dwim, 2017-11-26). While at it, add a missing ":" at the end of the same sentence since it precedes an example literal command block. Reported-by: Mike Nordell Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 41585f535d..c941c48827 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -52,10 +52,10 @@ is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as ``; it is synonymous with `@{-1}`. + -If is a branch name (call it `` and is not found, +If is a branch name (call it ``) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it ``) -with a matching name, treat as equivalent to +with a matching name, treat as equivalent to: ------------ $ git worktree add --track -b / ------------ -- cgit v1.2.3 From d023df1ee6fac80897aebe99cdefe7ec82067ce2 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Fri, 16 Feb 2018 15:44:52 -0500 Subject: git-worktree.txt: fix indentation of example and text of 'add' command When 4e85333197 (worktree: make add dwim, 2017-11-26) added an example command in a literal code block, it neglected to insert a mandatory "+" line before the block. This omission resulted in both the literal code block and the (existing) paragraph following the block to be outdented, even though they should be indented under the 'add' sub-command along with the rest of the text pertaining to that command. Furthermore, the mandatory "+" line separating the code block from the following text got rendered as a leading character on the line ("+ If ...") rather than being treated as a formatting directive. Fix these problems by adding the missing "+" line before the example code block. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-worktree.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index c941c48827..5ac3f68ab5 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -56,6 +56,7 @@ If is a branch name (call it ``) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it ``) with a matching name, treat as equivalent to: ++ ------------ $ git worktree add --track -b / ------------ -- cgit v1.2.3