diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2025-05-25 20:27:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-27 07:51:00 -0700 |
| commit | cbbb3b2d3897ea68f0d7ae441aec737e49586526 (patch) | |
| tree | ec048593fda08fa8c3ac3f4db53bde94a371c3fc /Documentation/merge-options.adoc | |
| parent | doc: convert merge options to new synopsis format (diff) | |
| download | git-cbbb3b2d3897ea68f0d7ae441aec737e49586526.tar.gz git-cbbb3b2d3897ea68f0d7ae441aec737e49586526.zip | |
doc: merge-options.adoc remove a misleading double negation
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/merge-options.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
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. |