kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jean-Noël Avila 2025-05-25 20:27:04 +00:00 committed by Junio C Hamano
parent 5f3213232f
commit cbbb3b2d38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/merge-options.adoc
View File

@ -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.