summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-06 21:53:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-06 21:53:24 (GMT)
commit8854ded7af794c10cc68957dbdd4c636811b97fa (patch)
tree9ed136498fe7bba1684df262fd568238dfcbed22 /builtin
parentb450a39beaedeb89f1e1830e2d6193c9d37b5f1b (diff)
parent36b14370dbafbe6682ea6b21c8de012253bff451 (diff)
downloadgit-8854ded7af794c10cc68957dbdd4c636811b97fa.zip
git-8854ded7af794c10cc68957dbdd4c636811b97fa.tar.gz
git-8854ded7af794c10cc68957dbdd4c636811b97fa.tar.bz2
Merge branch 'js/replace-edit-use-editor-configuration' into maint
"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);