pack-objects: use reachability bitmap index when generating non-stdout pack

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 30808a01e7657164618c18182704768e2df0d37e..5b4a62e93624bc8289c835631aab5d5f13dff708 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -117,3 +117,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.