summaryrefslogtreecommitdiffstats
path: root/Documentation/git-repack.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 13:50:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-18 13:50:29 -0700
commit249d54b2311f1ca866dc2ce87c207d700d071101 (patch)
treebb1ac0824918f3eaf9720b93d9f6c5df1c1e8b37 /Documentation/git-repack.txt
parentf4eec8ce05e725a5e30d3d29c47093d4e3e0ce7e (diff)
parentee34a2beadb94a9595f09af719e3c09b485ca797 (diff)
downloadgit-249d54b2311f1ca866dc2ce87c207d700d071101.tar.gz
git-249d54b2311f1ca866dc2ce87c207d700d071101.tar.xz
Merge branch 'jk/repack-pack-keep-objects'
* jk/repack-pack-keep-objects: repack: add `repack.packKeptObjects` config var
Diffstat (limited to 'Documentation/git-repack.txt')
-rw-r--r--Documentation/git-repack.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 002cfd5eb..4786a780b 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -117,6 +117,14 @@ other objects in that pack they already have locally.
must be able to refer to all reachable objects. This option
overrides the setting of `pack.writebitmaps`.
+--pack-kept-objects::
+ Include objects in `.keep` files when repacking. Note that we
+ still do not delete `.keep` packs after `pack-objects` finishes.
+ This means that we may duplicate objects, but this makes the
+ option safe to use when there are concurrent pushes or fetches.
+ This option is generally only useful if you are writing bitmaps
+ with `-b` or `pack.writebitmaps`, as it ensures that the
+ bitmapped packfile has the necessary objects.
Configuration
-------------