From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 1/6] git-http-push.txt,git-send-pack.txt: avoid single quote
Date: Thu, 13 May 2021 20:17:40 +0200 [thread overview]
Message-ID: <04e2d9de24db1e69803c495710f1f0908a12c91a.1620928059.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1620928059.git.martin.agren@gmail.com>
AsciiDoc matches up the very first backtick with the single quote
towards the end, and renders that first backtick literally:
`--force, ... other peoples' commits
Rewrite the "other peoples' commits" construction to drop the single
quote mark.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
Documentation/git-http-push.txt | 2 +-
Documentation/git-send-pack.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index ea03a4eeb0..cbb7d2de6d 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -85,7 +85,7 @@ Without `--force`, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast-forward check",
is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples' commits from there.
+remote ref and losing commits of other people from there.
With `--force`, the fast-forward check is disabled for all refs.
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 44fd146b91..d8c8acb96e 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -144,7 +144,7 @@ Without `--force`, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast-forward check",
is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples' commits from there.
+remote ref and losing commits of other people from there.
With `--force`, the fast-forward check is disabled for all refs.
--
2.31.1.751.gd2f1c929bd
next prev 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 ` Martin Ågren [this message]
2021-05-13 18:17 ` [PATCH 2/6] git-range-diff.txt: avoid single quotes Martin Ågren
2021-05-13 18:17 ` [PATCH 3/6] git-check-ref-format.txt: avoid single quote 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04e2d9de24db1e69803c495710f1f0908a12c91a.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).