aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config-options.md
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-10-13 01:52:43 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-10-13 02:07:39 +0200
commit626264a12dad24a20801f3fca2d996c3599b9429 (patch)
treeb6fc0082afa383ae0e20605d03e6db8133f28fb0 /Documentation/config-options.md
parent82e277c813398c9f519f16e83d080a94fa29a27c (diff)
parentda60ac9aa6029e0a9ca71ed92942d463888492e6 (diff)
downloadjgit-626264a12dad24a20801f3fca2d996c3599b9429.tar.gz
jgit-626264a12dad24a20801f3fca2d996c3599b9429.zip
Merge branch 'stable-6.4' into stable-6.5
* stable-6.4: PackConfig: fix @since tags Remove unused API problem filters Add support for git config repack.packKeptObjects Do not exclude objects in locked packs from bitmap processing Change-Id: I2951d01f5f4581bee20079508cd8ee6ca8554f1f
Diffstat (limited to 'Documentation/config-options.md')
-rw-r--r--Documentation/config-options.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config-options.md b/Documentation/config-options.md
index cbcb36a250..38ce324df0 100644
--- a/Documentation/config-options.md
+++ b/Documentation/config-options.md
@@ -112,3 +112,9 @@ Proxy configuration uses the standard Java mechanisms via class `java.net.ProxyS
| `pack.waitPreventRacyPack` | `false` | &#x20DE; | Whether we wait before opening a newly written pack to prevent its lastModified timestamp could be racy. |
| `pack.window` | `10` | &#x2705; | Number of objects to try when looking for a delta base per thread searching for deltas. |
| `pack.windowMemory` | `0` (unlimited) | &#x2705; | Maximum number of bytes to put into the delta search window. |
+
+## __repack__ options
+
+| option | default | git option | description |
+|---------|---------|------------|-------------|
+| `repack.packKeptObjects` | `true` when `pack.buildBitmaps` is set, `false` otherwise | &#x2705; | Include objects in packs locked by a `.keep` file when repacking. | \ No newline at end of file