diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-07 15:06:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-07 15:06:07 -0700 |
| commit | 8af5aac98667dfcce8ebe6efdb8df8aa0d134fb1 (patch) | |
| tree | 11e43de8991e177be6d3eae34794e877f64b3fda /Documentation/git-pack-objects.txt | |
| parent | 1fc548b2d6a3596f3e1c1f8b1930d8dbd1e30bf3 (diff) | |
| parent | c0b5d46ded46bf6e2cf4bb5325e4bf43374dd1ed (diff) | |
| download | git-8af5aac98667dfcce8ebe6efdb8df8aa0d134fb1.tar.xz | |
Merge branch 'tb/multi-cruft-pack'
Use of --max-pack-size to allow multiple packfiles to be created is
now supported even when we are sending unreachable objects to cruft
packs.
* tb/multi-cruft-pack:
Documentation/gitformat-pack.txt: drop mixed version section
Documentation/gitformat-pack.txt: remove multi-cruft packs alternative
builtin/pack-objects.c: support `--max-pack-size` with `--cruft`
builtin/pack-objects.c: remove unnecessary strbuf_reset()
Diffstat (limited to 'Documentation/git-pack-objects.txt')
| -rw-r--r-- | Documentation/git-pack-objects.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index a9995a932c..dea7eacb0f 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -116,9 +116,7 @@ unreachable object whose mtime is newer than the `--cruft-expiration`). + Incompatible with `--unpack-unreachable`, `--keep-unreachable`, `--pack-loose-unreachable`, `--stdin-packs`, as well as any other -options which imply `--revs`. Also incompatible with `--max-pack-size`; -when this option is set, the maximum pack size is not inferred from -`pack.packSizeLimit`. +options which imply `--revs`. --cruft-expiration=<approxidate>:: If specified, objects are eliminated from the cruft pack if they |