diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:06:01 -0700 |
| commit | e5e9714a106ab668ac982cf73f31919eb4e354fd (patch) | |
| tree | 01c02ee795feeb0b7594ab9d91f20bfe619d3042 /Documentation | |
| parent | 6aad47dec7a72bb36c64afb6c43f4dbcaa49e7f9 (diff) | |
| parent | bbefaa1f38a47e06c32612edc2f64a0168cc40b2 (diff) | |
| download | git-e5e9714a106ab668ac982cf73f31919eb4e354fd.tar.gz | |
Merge branch 'bc/repack'
* bc/repack:
Documentation/git-repack.txt: document new -A behaviour
let pack-objects do the writing of unreachable objects as loose objects
add a force_object_loose() function
builtin-gc.c: deprecate --prune, it now really has no effect
git-gc: always use -A when manually repacking
repack: modify behavior of -A option to leave unreferenced objects unpacked
Conflicts:
builtin-pack-objects.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-repack.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index d14ab5154f..f81a6607de 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository SYNOPSIS -------- -'git-repack' [-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] +'git-repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] DESCRIPTION ----------- @@ -37,6 +37,18 @@ OPTIONS leaves behind, but `git fsck --full` shows as dangling. +-A:: + Same as `-a`, but any unreachable objects in a previous + pack become loose, unpacked objects, instead of being + left in the old pack. Unreachable objects are never + intentionally added to a pack, even when repacking. + When used with '-d', this option + prevents unreachable objects from being immediately + deleted by way of being left in the old pack and then + removed. Instead, the loose unreachable objects + will be pruned according to normal expiry rules + with the next linkgit:git-gc[1]. + -d:: After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. |