Merge branch 'ds/commit-graph-fsck'

Finishing touches to doc.

* ds/commit-graph-fsck:
  config: fix commit-graph related config docs
This commit is contained in:
Junio C Hamano
2018-08-27 14:33:51 -07:00

View File

@ -927,12 +927,10 @@ core.notesRef::
This setting defaults to "refs/notes/commits", and it can be overridden by This setting defaults to "refs/notes/commits", and it can be overridden by
the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1].
gc.commitGraph:: core.commitGraph::
If true, then gc will rewrite the commit-graph file when If true, then git will read the commit-graph file (if it exists)
linkgit:git-gc[1] is run. When using linkgit:git-gc[1] to parse the graph structure of commits. Defaults to false. See
'--auto' the commit-graph will be updated if housekeeping is linkgit:git-commit-graph[1] for more information.
required. Default is false. See linkgit:git-commit-graph[1]
for details.
core.useReplaceRefs:: core.useReplaceRefs::
If set to `false`, behave as if the `--no-replace-objects` If set to `false`, behave as if the `--no-replace-objects`
@ -1767,6 +1765,13 @@ this configuration variable is ignored, all packs except the base pack
will be repacked. After this the number of packs should go below will be repacked. After this the number of packs should go below
gc.autoPackLimit and gc.bigPackThreshold should be respected again. gc.autoPackLimit and gc.bigPackThreshold should be respected again.
gc.writeCommitGraph::
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.
gc.logExpiry:: gc.logExpiry::
If the file gc.log exists, then `git gc --auto` won't run If the file gc.log exists, then `git gc --auto` won't run
unless that file is more than 'gc.logExpiry' old. Default is unless that file is more than 'gc.logExpiry' old. Default is