Merge branch 'jk/repack-pack-keep-objects'

* jk/repack-pack-keep-objects:
repack: add `repack.packKeptObjects` config var

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-repack.txt
Simple merge

diff --cc builtin/repack.c
index 49f5857627fd616b1019063f3f2d1937b20004fd,50cc2815279e17b255ddc74d23f619e1259b8a7c..6b0b62dcb2687e78ec433e7de1103f0c0f74a1fc
--- 1/builtin/repack.c
--- 2/builtin/repack.c
+++ b/builtin/repack.c
@@@ -167,14 -172,16 +172,16 @@@ int cmd_repack(int argc, const char **a
                                N_("write bitmap index")),
                OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
                                N_("with -A, do not loosen objects older than this")),
 -              OPT_INTEGER(0, "window", &window,
 +              OPT_STRING(0, "window", &window, N_("n"),
                                N_("size of the window used for delta compression")),
 -              OPT_INTEGER(0, "window-memory", &window_memory,
 +              OPT_STRING(0, "window-memory", &window_memory, N_("bytes"),
                                N_("same as the above, but limit memory size instead of entries count")),
 -              OPT_INTEGER(0, "depth", &depth,
 +              OPT_STRING(0, "depth", &depth, N_("n"),
                                N_("limits the maximum delta depth")),
 -              OPT_INTEGER(0, "max-pack-size", &max_pack_size,
 +              OPT_STRING(0, "max-pack-size", &max_pack_size, N_("bytes"),
                                N_("maximum size of each packfile")),
+               OPT_BOOL(0, "pack-kept-objects", &pack_kept_objects,
+                               N_("repack objects in packs marked with .keep")),
                OPT_END()
        };
  

diff --cc t/t7700-repack.sh
Simple merge