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

diff --cc Documentation/config.txt
index 63365dcf3db6f57f978ed5d2fc67af5fecb0c535,bcf3d21ecb2aa7a2d78d5e9eca82fe1e4e88b5a9..3a4ff5722cfdc2214cfebe93f1f48b6767fa34d1
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -917,13 -907,15 +917,18 @@@ core.notesRef:
  This setting defaults to "refs/notes/commits", and it can be overridden by
  the `GIT_NOTES_REF` environment variable.  See linkgit:git-notes[1].
  
 -core.commitGraph::
 -      Enable git commit graph feature. Allows reading from the
 -      commit-graph file.
 +gc.commitGraph::
 +      If true, then gc will rewrite the commit-graph file when
 +      linkgit:git-gc[1] is run. When using linkgit:git-gc[1]
 +      '--auto' the commit-graph will be updated if housekeeping is
 +      required. Default is false. See linkgit:git-commit-graph[1]
 +      for details.
  
+ core.useReplaceRefs::
+       If set to `false`, behave as if the `--no-replace-objects`
+       option was given on the command line. See linkgit:git[1] and
+       linkgit:git-replace[1] for more information.
+ 
  core.sparseCheckout::
        Enable "sparse checkout" feature. See section "Sparse checkout" in
        linkgit:git-read-tree[1] for more information.

diff --cc builtin/fsck.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/prune.c
Simple merge

diff --cc builtin/replace.c
Simple merge

diff --cc builtin/unpack-objects.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc environment.c
Simple merge

diff --cc git.c
Simple merge

diff --cc log-tree.c
Simple merge