summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-13 04:57:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-13 05:13:39 (GMT)
commite08bc7a9ec2c6988d90b603792760a3add11b9a0 (patch)
tree4f07c0b5105fcfae4741ec903b3b9f29a9934126
parent9a3d637541a5b6fcd84b6f5fa057e597d1696460 (diff)
downloadgit-e08bc7a9ec2c6988d90b603792760a3add11b9a0.zip
git-e08bc7a9ec2c6988d90b603792760a3add11b9a0.tar.gz
git-e08bc7a9ec2c6988d90b603792760a3add11b9a0.tar.bz2
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>
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/git-rebase.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 843a20b..bcf54da 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -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.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c8ab48d..1920be3 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -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):
------------