doc: fix misrendering due to `single quote'
AsciiDoc misparses some text that contains a `literal` word followed by a fancy `single quote' word, and treats everything from the start of the literal to the end of the quote as a single-quoted phrase. We can work around this by switching the latter to be a literal, as well. In the first case, this is perhaps what was intended anyway, as it makes us consistent with the the earlier literals in the same paragraph. In the second, the output is arguably better, as we will format our commit references as <code> blocks. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 13, 2015 at 00:57 UTC
e08bc7a9ec2c6988d90b603792760a3add11b9a0
2 files changed
+2
-2
Documentation/diff-generate-patch.txt
+1
-1
@@ -77,7 +77,7 @@ combined diff format
77
Any diff-generating command can take the `-c` or `--cc` option to
78
produce a 'combined diff' when showing a merge. This is the default
79
format when showing merges with linkgit:git-diff[1] or
80
-linkgit:git-show[1]. Note also that you can give the `-m' option to any
80
+linkgit:git-show[1]. Note also that you can give the `-m` option to any
81
of these commands to force generation of diffs with individual parents
82
of a merge.
83
Documentation/git-rebase.txt
+1
-1
@@ -80,7 +80,7 @@ remain the checked-out branch.
80
If the upstream branch already contains a change you have made (e.g.,
81
because you mailed a patch which was applied upstream), then that commit
82
will be skipped. For example, running `git rebase master` on the
83
-following history (in which A' and A introduce the same set of changes,
83
+following history (in which `A'` and `A` introduce the same set of changes,
84
but have different committer information):
85
86
------------