Merge branch 'js/http-custom-headers'
[gitweb.git] / Documentation / merge-options.txt
index f08e9b80c562faa1de2408cd4cfdb7253d3be1f2..dfb43d000fa8f539a99bae771fca87abfd46e507 100644 (file)
@@ -114,3 +114,11 @@ ifndef::git-pull[]
        reporting.
 
 endif::git-pull[]
+
+--allow-unrelated-histories::
+       By default, `git merge` command refuses to merge histories
+       that do not share a common ancestor.  This option can be
+       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.