From: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Jean-Noël Avila" <jn.avila@free.fr>,
"Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH 4/9] doc: merge-options.adoc remove a misleading double negation
Date: Sun, 25 May 2025 20:27:04 +0000 [thread overview]
Message-ID: <038941c5be104536a4b894abb58d014a3fe583de.1748204829.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1927.git.1748204829.gitgitgadget@gmail.com>
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
Documentation/merge-options.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc
index 9b3c7d6df4ef..078f4f6157a1 100644
--- a/Documentation/merge-options.adoc
+++ b/Documentation/merge-options.adoc
@@ -203,7 +203,7 @@ endif::git-pull[]
used to override this safety when merging histories of two
projects that started their lives independently. As that is
a very rare occasion, no configuration variable to enable
- this by default exists and will not be added.
+ this by default exists or will be added.
ifdef::git-pull[]
+
Only useful when merging.
--
gitgitgadget
next prev parent reply other threads:[~2025-05-25 20:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-25 20:27 [PATCH 0/9] doc: convert checkout, switch and merge to new format Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 1/9] doc: convert git-checkout manpage to new style Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 2/9] doc: convert git-merge " Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 3/9] doc: convert merge options to new synopsis format Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` Jean-Noël Avila via GitGitGadget [this message]
2025-05-25 20:27 ` [PATCH 5/9] doc: convert merge strategies to " Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 6/9] doc: switch merge config description to new " Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 7/9] doc: convert git-mergetool manpage to new synopsis style Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 8/9] doc: convert git-mergetool options " Jean-Noël Avila via GitGitGadget
2025-05-25 20:27 ` [PATCH 9/9] doc: convert git-switch manpage " Jean-Noël Avila via GitGitGadget
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=038941c5be104536a4b894abb58d014a3fe583de.1748204829.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
/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).