From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:51 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-fsck'
X-Git-Tag: v2.19.0-rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa5dc61161e7d3b0734628de00d84589136b8368;p=thirdparty%2Fgit.git

Merge branch 'ds/commit-graph-fsck'

Finishing touches to doc.

* ds/commit-graph-fsck:
  config: fix commit-graph related config docs
---

aa5dc61161e7d3b0734628de00d84589136b8368
diff --cc Documentation/config.txt
index 322d93262f,de160f1ead..eb66a11975
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -927,18 -904,11 +927,16 @@@ 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].
  
- 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.commitGraph::
+ 	If true, then git will read the commit-graph file (if it exists)
+ 	to parse the graph structure of commits. Defaults to false. See
+ 	linkgit:git-commit-graph[1] for more information.
  
 +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.