rebase -r: support merge strategies other than `recursive`

diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index f3353564f99205b278362484abcdf1537058ef29..cfbd5c36c7640bc841a68bb5a524f025c43212fd 100644 (file)
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "config.h"
 #include "parse-options.h"
 #include "refs.h"
 #include "repository.h"
@@ -16,6 +17,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
                OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
                OPT_END(),
        };
+       git_config(git_default_config, NULL);
        if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
                usage_with_options(pack_refs_usage, opts);
        return refs_pack_refs(get_main_ref_store(the_repository), flags);