{"thread":{"id":"47867","subject":"[PATCH 0/2] fix minor git-worktree.txt botches","startedAt":"2018-02-16T20:45:35Z","lastAt":"2018-02-16T21:28:25Z","messageCount":4,"participants":["Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"339577","messageId":"20180216204452.2153-1-sunshine@sunshineco.com","threadId":"47867","inReplyTo":null,"subject":"[PATCH 0/2] fix minor git-worktree.txt botches","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-02-16T20:44:50Z","receivedAt":"2018-02-16T20:45:35Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"This patch series fixes a couple git-worktree.txt botches from\n4e85333197 (worktree: make add <path> <branch> dwim, 2017-11-26).\n\nEric Sunshine (2):\n  git-worktree.txt: fix missing \")\" typo\n  git-worktree.txt: fix indentation of example and text of 'add' command\n\n Documentation/git-worktree.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\n-- \n2.16.1.374.g7648891022\n\n"},{"id":"339578","messageId":"20180216204452.2153-3-sunshine@sunshineco.com","threadId":"47867","inReplyTo":"20180216204452.2153-1-sunshine@sunshineco.com","subject":"[PATCH 2/2] git-worktree.txt: fix indentation of example and text of 'add' command","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-02-16T20:44:52Z","receivedAt":"2018-02-16T20:45:38Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"When 4e85333197 (worktree: make add <path> <branch> dwim, 2017-11-26)\nadded an example command in a literal code block, it neglected to\ninsert a mandatory \"+\" line before the block. This omission resulted\nin both the literal code block and the (existing) paragraph following\nthe block to be outdented, even though they should be indented under\nthe 'add' sub-command along with the rest of the text pertaining to\nthat command. Furthermore, the mandatory \"+\" line separating the code\nblock from the following text got rendered as a leading character on\nthe line (\"+ If <commit-ish>...\") rather than being treated as a\nformatting directive.\n\nFix these problems by adding the missing \"+\" line before the example\ncode block.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/git-worktree.txt | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex c941c48827..5ac3f68ab5 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -56,6 +56,7 @@ If <commit-ish> is a branch name (call it `<branch>`) and is not found,\n and neither `-b` nor `-B` nor `--detach` are used, but there does\n exist a tracking branch in exactly one remote (call it `<remote>`)\n with a matching name, treat as equivalent to:\n++\n ------------\n $ git worktree add --track -b <branch> <path> <remote>/<branch>\n ------------\n-- \n2.16.1.374.g7648891022\n\n"},{"id":"339579","messageId":"20180216204452.2153-2-sunshine@sunshineco.com","threadId":"47867","inReplyTo":"20180216204452.2153-1-sunshine@sunshineco.com","subject":"[PATCH 1/2] git-worktree.txt: fix missing \")\" typo","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-02-16T20:44:51Z","receivedAt":"2018-02-16T20:45:41Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"Add the closing \")\" to a parenthetical phrase introduced by 4e85333197\n(worktree: make add <path> <branch> dwim, 2017-11-26).\n\nWhile at it, add a missing \":\" at the end of the same sentence since\nit precedes an example literal command block.\n\nReported-by: Mike Nordell <tamlin.thefirst@gmail.com>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/git-worktree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 41585f535d..c941c48827 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -52,10 +52,10 @@ is linked to the current repository, sharing everything except working\n directory specific files such as HEAD, index, etc. `-` may also be\n specified as `<commit-ish>`; it is synonymous with `@{-1}`.\n +\n-If <commit-ish> is a branch name (call it `<branch>` and is not found,\n+If <commit-ish> is a branch name (call it `<branch>`) and is not found,\n and neither `-b` nor `-B` nor `--detach` are used, but there does\n exist a tracking branch in exactly one remote (call it `<remote>`)\n-with a matching name, treat as equivalent to\n+with a matching name, treat as equivalent to:\n ------------\n $ git worktree add --track -b <branch> <path> <remote>/<branch>\n ------------\n-- \n2.16.1.374.g7648891022\n\n"},{"id":"339581","messageId":"xmqq372062vi.fsf@gitster-ct.c.googlers.com","threadId":"47867","inReplyTo":"20180216204452.2153-1-sunshine@sunshineco.com","subject":"Re: [PATCH 0/2] fix minor git-worktree.txt botches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-02-16T21:28:17Z","receivedAt":"2018-02-16T21:28:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> This patch series fixes a couple git-worktree.txt botches from\n> 4e85333197 (worktree: make add <path> <branch> dwim, 2017-11-26).\n>\n> Eric Sunshine (2):\n>   git-worktree.txt: fix missing \")\" typo\n>   git-worktree.txt: fix indentation of example and text of 'add' command\n>\n>  Documentation/git-worktree.txt | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n\nBoth patches looked trivially correct; thanks.\n"}]}