mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
5f3213232f
commit
cbbb3b2d38
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user