Merge branch 'jk/core-use-replace-refs'
commit1689c22c1c328e9135ed51458e9f9a5d224c5057
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:22 +0000 (15 15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:23 +0000 (15 15:08 -0700)
tree774db619c960df03d49743e5f0bf06b34a8dcc0c
parenta14a9bfc132f8fe80cca33d14b1acbcda945de13
parentda4398d6a03eb2cf857aa63190e9bf60305befd2
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
12 files changed:
Documentation/config.txt
builtin/fsck.c
builtin/index-pack.c
builtin/pack-objects.c
builtin/prune.c
builtin/replace.c
builtin/unpack-objects.c
cache.h
config.c
environment.c
git.c
log-tree.c