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>
This commit is contained in:
parent
9a3d637541
commit
e08bc7a9ec
@ -77,7 +77,7 @@ combined diff format
|
||||
Any diff-generating command can take the `-c` or `--cc` option to
|
||||
produce a 'combined diff' when showing a merge. This is the default
|
||||
format when showing merges with linkgit:git-diff[1] or
|
||||
linkgit:git-show[1]. Note also that you can give the `-m' option to any
|
||||
linkgit:git-show[1]. Note also that you can give the `-m` option to any
|
||||
of these commands to force generation of diffs with individual parents
|
||||
of a merge.
|
||||
|
||||
|
@ -80,7 +80,7 @@ remain the checked-out branch.
|
||||
If the upstream branch already contains a change you have made (e.g.,
|
||||
because you mailed a patch which was applied upstream), then that commit
|
||||
will be skipped. For example, running `git rebase master` on the
|
||||
following history (in which A' and A introduce the same set of changes,
|
||||
following history (in which `A'` and `A` introduce the same set of changes,
|
||||
but have different committer information):
|
||||
|
||||
------------
|
||||
|
Loading…
Reference in New Issue
Block a user