]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-multi-pack-index(1): remove non-existent incompatibility
authorTaylor Blau <me@ttaylorr.com>
Sat, 6 Dec 2025 20:31:10 +0000 (15:31 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Dec 2025 22:38:05 +0000 (07:38 +0900)
Since fcb2205b774 (midx: implement support for writing incremental MIDX
chains, 2024-08-06), the command-line options '--incremental' and
'--bitmap' were declared to be incompatible with one another when
running 'git multi-pack-index write'.

However, since 27afc272c49 (midx: implement writing incremental MIDX
bitmaps, 2025-03-20), that incompatibility no longer exists, despite the
documentation saying so. Correct this by removing the stale reference to
their incompatibility.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-multi-pack-index.adoc

index a4550e28bedd5b5cddc5242e399afb24e20c30ea..a502819fc38858da1c8134e4ad7ebe7e219a7b98 100644 (file)
@@ -75,7 +75,7 @@ marker).
                Write an incremental MIDX file containing only objects
                and packs not present in an existing MIDX layer.
                Migrates non-incremental MIDXs to incremental ones when
-               necessary. Incompatible with `--bitmap`.
+               necessary.
 --
 
 verify::