summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-27 21:33:51 (GMT)
commitaa5dc61161e7d3b0734628de00d84589136b8368 (patch)
tree53e23af2bd970cfa6326ae88a37796f5f8c0b17f
parent6201d755b9b51e70cfa8a050970d29fc379e607c (diff)
parentd915114a3bd64d2547048249d0cc00b45ceb6709 (diff)
downloadgit-aa5dc61161e7d3b0734628de00d84589136b8368.zip
git-aa5dc61161e7d3b0734628de00d84589136b8368.tar.gz
git-aa5dc61161e7d3b0734628de00d84589136b8368.tar.bz2
Merge branch 'ds/commit-graph-fsck'
Finishing touches to doc. * ds/commit-graph-fsck: config: fix commit-graph related config docs
-rw-r--r--Documentation/config.txt17
1 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 322d932..eb66a11 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -927,12 +927,10 @@ 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`
@@ -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
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::
If the file gc.log exists, then `git gc --auto` won't run
unless that file is more than 'gc.logExpiry' old. Default is