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
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user