From: Jean-Noël Avila Date: Sun, 25 May 2025 20:27:04 +0000 (+0000) Subject: doc: merge-options.adoc remove a misleading double negation X-Git-Tag: v2.50.0-rc1~8^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbbb3b2d3897ea68f0d7ae441aec737e49586526;p=thirdparty%2Fgit.git doc: merge-options.adoc remove a misleading double negation Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc index 9b3c7d6df4..078f4f6157 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.