Merge branch 'nd/upload-pack-shallow'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 79e576878af5eb44b21fc0763faeb30519e022c3..73c8973aae5bfad789a998e5623fc219959edaf6 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2156,6 +2156,13 @@ repack.usedeltabaseoffset::
        "false" and repack. Access from old Git versions over the
        native protocol are unaffected by this option.
 
+repack.packKeptObjects::
+       If set to true, makes `git repack` act as if
+       `--pack-kept-objects` was passed. See linkgit:git-repack[1] for
+       details. Defaults to `false` normally, but `true` if a bitmap
+       index is being written (either via `--write-bitmap-index` or
+       `pack.writeBitmaps`).
+
 rerere.autoupdate::
        When set to true, `git-rerere` updates the index with the
        resulting contents after it cleanly resolves conflicts using