Skip to content

Commit e08bc7a

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9a3d637 commit e08bc7a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/diff-generate-patch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ combined diff format
7777
Any diff-generating command can take the `-c` or `--cc` option to
7878
produce a 'combined diff' when showing a merge. This is the default
7979
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
8181
of these commands to force generation of diffs with individual parents
8282
of a merge.
8383

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ remain the checked-out branch.
8080
If the upstream branch already contains a change you have made (e.g.,
8181
because you mailed a patch which was applied upstream), then that commit
8282
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,
8484
but have different committer information):
8585

8686
------------

0 commit comments

Comments
 (0)