From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:22 +0000 (-0700)
Subject: Merge branch 'jk/core-use-replace-refs'
X-Git-Tag: v2.19.0-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1689c22c1c328e9135ed51458e9f9a5d224c5057?hp=--cc

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
---

1689c22c1c328e9135ed51458e9f9a5d224c5057
diff --cc Documentation/config.txt
index 63365dcf3d,bcf3d21ecb..3a4ff5722c
--- a/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.