summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-10-13 08:46:11 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-10-13 08:50:48 +0200
commitb6098c549d1ad052917a3515d2d1c19c03b7bce9 (patch)
tree670ecc387894217a5a1bb01f19213c328d301457 /Documentation
parent43d6bc5ef1add70315b411969aac2ad84bf0f492 (diff)
parent626264a12dad24a20801f3fca2d996c3599b9429 (diff)
downloadjgit-b6098c549d1ad052917a3515d2d1c19c03b7bce9.tar.gz
jgit-b6098c549d1ad052917a3515d2d1c19c03b7bce9.zip
Merge branch 'stable-6.5' into stable-6.6
* stable-6.5: 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: I7272a22451c0de6b4770767e7bb4e24c81518c20
Diffstat (limited to 'Documentation')
-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 3495813e76..36b25c8e36 100644
--- a/Documentation/config-options.md
+++ b/Documentation/config-options.md
@@ -118,3 +118,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