From: Todd Zullinger Date: Wed, 10 Apr 2019 00:37:33 +0000 (-0400) Subject: Documentation/git-show-branch: avoid literal {apostrophe} X-Git-Tag: v2.22.0-rc0~47^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f64a21bd82696dbf7c770f36624b9c19cfd84081;p=git Documentation/git-show-branch: avoid literal {apostrophe} The {apostrophe} was needed at the time of a521845800 ("Documentation: remove stray backslash in show-branch discussion", 2010-08-20). All other uses of {apostrophe} were removed in 6cf378f0cb ("docs: stop using asciidoc no-inline-literal", 2012-04-26). Unfortunately, the {apostrophe} is rendered literally with Asciidoctor (at least with 1.5.5-2.0.3). Avoid this by using single-quotes. Escaping the leading single-quote allows the content to render properly in AsciiDoc and Asciidoctor. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 4a01371227..5cc2fcefba 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -167,7 +167,7 @@ $ git show-branch master fixes mhf ------------------------------------------------ These three branches all forked from a common commit, [master], -whose commit message is "Add {apostrophe}git show-branch{apostrophe}". +whose commit message is "Add \'git show-branch'". The "fixes" branch adds one commit "Introduce "reset type" flag to "git reset"". The "mhf" branch adds many other commits. The current branch is "master".