summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:07 (GMT)
commit60b3e9b959f4423f6927ef77e7097bea3ad24e45 (patch)
tree76fe47781a43ebdc202c55dbf0493813ab8d33b4 /builtin
parent9cb50a3ca60a5c5969deb83d11782da26c3bcdb7 (diff)
parent36b14370dbafbe6682ea6b21c8de012253bff451 (diff)
downloadgit-60b3e9b959f4423f6927ef77e7097bea3ad24e45.zip
git-60b3e9b959f4423f6927ef77e7097bea3ad24e45.tar.gz
git-60b3e9b959f4423f6927ef77e7097bea3ad24e45.tar.bz2
Merge branch 'js/replace-edit-use-editor-configuration'
"git replace -e" did not honour "core.editor" configuration. * js/replace-edit-use-editor-configuration: replace --edit: respect core.editor
Diffstat (limited to 'builtin')
-rw-r--r--builtin/replace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index 748c6ca..b58c714 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -440,6 +440,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
};
check_replace_refs = 0;
+ git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);