[PATCH 4/9] doc: merge-options.adoc remove a misleading double negation
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
Jean-Noël Avila via GitGitGadget <gitgitgadget@gmail.com>