summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-11-02 16:53:27 +0900
committerJunio C Hamano <gitster@pobox.com>2023-11-02 16:53:27 +0900
commit8a26aaa91ed5bcb351f83fc00eac8944ec9f1b79 (patch)
treee21bcc8bee350d8d3f71e9af1be0570547d8c0aa
parent382d55a9d3b7d459b14c3c085fc5f1c228190493 (diff)
parentca3285dd69413c599687e9024127767dd4a3be62 (diff)
downloadgit-8a26aaa91ed5bcb351f83fc00eac8944ec9f1b79.tar.gz
Merge branch 'ps/git-repack-doc-fixes' into maint-2.42
Doc updates. * ps/git-repack-doc-fixes: doc/git-repack: don't mention nonexistent "--unpacked" option doc/git-repack: fix syntax for `-g` shorthand option
-rw-r--r--Documentation/git-repack.txt9
1 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 4017157949..b63e8abc7d 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -186,7 +186,7 @@ depth is 4095.
Pass the `--delta-islands` option to `git-pack-objects`, see
linkgit:git-pack-objects[1].
--g=<factor>::
+-g<factor>::
--geometric=<factor>::
Arrange resulting pack structure so that each successive pack
contains at least `<factor>` times the number of objects as the
@@ -203,11 +203,8 @@ uniquely by the set of packs being "rolled-up"; in other words, the
packs determined to need to be combined in order to restore a geometric
progression.
+
-When `--unpacked` is specified, loose objects are implicitly included in
-this "roll-up", without respect to their reachability. This is subject
-to change in the future. This option (implying a drastically different
-repack mode) is not guaranteed to work with all other combinations of
-option to `git repack`.
+Loose objects are implicitly included in this "roll-up", without respect to
+their reachability. This is subject to change in the future.
+
When writing a multi-pack bitmap, `git repack` selects the largest resulting
pack as the preferred pack for object selection by the MIDX (see