git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 2/6] git-range-diff.txt: avoid single quotes
Date: Thu, 13 May 2021 20:17:41 +0200	[thread overview]
Message-ID: <187b7290cfb516b957762e82538e64abda255cd3.1620928059.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1620928059.git.martin.agren@gmail.com>

Similar to the previous commit, the use of backticks for monospacing and
a single quote as an apostrophe trip up AsciiDoc in two places which
render as follows:

    `git range-diff ... diffs' coloring

    ‘1` is ... commits' patches

Reword slighly to avoid those last single quotes.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 Documentation/git-range-diff.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt
index fe350d7f40..6e9a0ea6b6 100644
--- a/Documentation/git-range-diff.txt
+++ b/Documentation/git-range-diff.txt
@@ -45,7 +45,7 @@ OPTIONS
 -------
 --no-dual-color::
 	When the commit diffs differ, `git range-diff` recreates the
-	original diffs' coloring, and adds outer -/+ diff markers with
+	coloring of the original diffs, and adds outer -/+ diff markers with
 	the *background* being red/green to make it easier to see e.g.
 	when there was a change in what exact lines were added.
 +
@@ -239,8 +239,8 @@ because of the modification:
 In mathematical terms, what we are looking for is some sort of a minimum
 cost bipartite matching; `1` is matched to `C` at some cost, etc. The
 underlying graph is in fact a complete bipartite graph; the cost we
-associate with every edge is the size of the diff between the two
-commits' patches. To explain also new commits, we introduce dummy nodes
+associate with every edge is the size of the diff between the patches of
+the two commits. To explain also new commits, we introduce dummy nodes
 on both sides:
 
 ------------
-- 
2.31.1.751.gd2f1c929bd


  parent reply	other threads:[~2021-05-13 18:18 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-13 18:17 [PATCH 0/6] AsciiDoc vs Asciidoctor, once again Martin Ågren
2021-05-13 18:17 ` [PATCH 1/6] git-http-push.txt,git-send-pack.txt: avoid single quote Martin Ågren
2021-05-13 18:17 ` Martin Ågren [this message]
2021-05-13 18:17 ` [PATCH 3/6] git-check-ref-format.txt: " Martin Ågren
2021-05-13 19:16   ` Eric Sunshine
2021-05-13 19:35     ` Martin Ågren
2021-05-13 22:00   ` Junio C Hamano
2021-05-14  9:07     ` Martin Ågren
2021-05-14 12:30       ` Felipe Contreras
2021-05-14  5:30   ` Jeff King
2021-05-14  9:08     ` Martin Ågren
2021-05-13 18:17 ` [PATCH 4/6] diff-options.txt: move monospace markup out of attribute Martin Ågren
2021-05-13 18:17 ` [PATCH 5/6] git-svn.txt: change verse to listing block Martin Ågren
2021-05-13 18:17 ` [PATCH 6/6] Doc: use two backticks for monospace, not backtick+apostrophe Martin Ågren
2021-05-13 20:35 ` [PATCH 0/6] AsciiDoc vs Asciidoctor, once again Junio C Hamano
2021-05-14  8:40   ` Martin Ågren
2021-05-14 12:18     ` Felipe Contreras
2021-05-14  1:40 ` Felipe Contreras
2021-05-14  8:43   ` Martin Ågren
2021-05-14 12:24     ` Felipe Contreras
2021-05-14 15:28       ` Martin Ågren
2021-05-14 20:11         ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=187b7290cfb516b957762e82538e64abda255cd3.1620928059.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).