diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:23 -0700 |
commit | 1689c22c1c328e9135ed51458e9f9a5d224c5057 (patch) | |
tree | 774db619c960df03d49743e5f0bf06b34a8dcc0c /builtin/replace.c | |
parent | Merge branch 'jh/json-writer' (diff) | |
parent | add core.usereplacerefs config option (diff) | |
download | tgif-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.xz |
Merge branch 'jk/core-use-replace-refs'
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
* jk/core-use-replace-refs:
add core.usereplacerefs config option
check_replace_refs: rename to read_replace_refs
check_replace_refs: fix outdated comment
Diffstat (limited to 'builtin/replace.c')
-rw-r--r-- | builtin/replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index ef22d724bb..e997a562f0 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -544,7 +544,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix) OPT_END() }; - check_replace_refs = 0; + read_replace_refs = 0; git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0); |