aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2026-02-24 13:59:52 -0500
committerJunio C Hamano <gitster@pobox.com>2026-02-24 11:16:32 -0800
commitf775d5b1cf7b3d7ec0b8448684b8710c82013684 (patch)
tree60b0a6cddde104792f4c1c8fd6c94f7dcb11db0d
parent6b8fb17490f637f5651834596b08cdb255e9280a (diff)
downloadgit-f775d5b1cf7b3d7ec0b8448684b8710c82013684.tar.xz
git-multi-pack-index(1): remove non-existent incompatibility
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>
-rw-r--r--Documentation/git-multi-pack-index.adoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-multi-pack-index.adoc b/Documentation/git-multi-pack-index.adoc
index a4550e28be..a502819fc3 100644
--- a/Documentation/git-multi-pack-index.adoc
+++ b/Documentation/git-multi-pack-index.adoc
@@ -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::