diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-15 13:59:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-15 13:59:06 -0700 |
| commit | 80754c5cc05955dd0159fa40d7b82b2802a4deba (patch) | |
| tree | 68197d59a89c0d32ad358c17a97cffe1ccb6ea71 /builtin | |
| parent | db13ea835b056afa13ab96c9f96dce011ecc328a (diff) | |
| parent | b6551feadfda76379a28f424ea46998e2b995d07 (diff) | |
| download | git-80754c5cc05955dd0159fa40d7b82b2802a4deba.tar.gz | |
Merge branch 'ds/merge-tree-use-config'
Allow git forges to disable replace-refs feature while running "git
merge-tree".
* ds/merge-tree-use-config:
merge-tree: load default git config
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index aa8040c2a6..b8f8a8b5d9 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -17,6 +17,7 @@ #include "merge-blobs.h" #include "quote.h" #include "tree.h" +#include "config.h" static int line_termination = '\n'; @@ -628,6 +629,8 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) if (argc != expected_remaining_argc) usage_with_options(merge_tree_usage, mt_options); + git_config(git_default_config, NULL); + /* Do the relevant type of merge */ if (o.mode == MODE_REAL) return real_merge(&o, merge_base, argv[0], argv[1], prefix); |