config: fix commit-graph related config docs
The core.commitGraph config setting was accidentally removed from the config documentation. In that same patch, the config setting that writes a commit-graph during garbage collection was incorrectly written to the doc as "gc.commitGraph" instead of "gc.writeCommitGraph". Reported-by: Szeder Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Aug 23, 2018 at 15:51 UTC
d915114a3bd64d2547048249d0cc00b45ceb6709
1 file changed
+11
-6
Documentation/config.txt
+11
-6
@@ -904,12 +904,10 @@ core.notesRef::
904
This setting defaults to "refs/notes/commits", and it can be overridden by
905
the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1].
906
907
-gc.commitGraph::
908
- If true, then gc will rewrite the commit-graph file when
909
- linkgit:git-gc[1] is run. When using linkgit:git-gc[1]
910
- '--auto' the commit-graph will be updated if housekeeping is
911
- required. Default is false. See linkgit:git-commit-graph[1]
912
- for details.
907
+core.commitGraph::
908
+ If true, then git will read the commit-graph file (if it exists)
909
+ to parse the graph structure of commits. Defaults to false. See
910
+ linkgit:git-commit-graph[1] for more information.
911
912
core.sparseCheckout::
913
Enable "sparse checkout" feature. See section "Sparse checkout" in
@@ -1651,6 +1649,13 @@ this configuration variable is ignored, all packs except the base pack
1649
will be repacked. After this the number of packs should go below
1650
gc.autoPackLimit and gc.bigPackThreshold should be respected again.
1651
1652
+gc.writeCommitGraph::
1653
+ If true, then gc will rewrite the commit-graph file when
1654
+ linkgit:git-gc[1] is run. When using linkgit:git-gc[1]
1655
+ '--auto' the commit-graph will be updated if housekeeping is
1656
+ required. Default is false. See linkgit:git-commit-graph[1]
1657
+ for details.
1658
+
1659
gc.logExpiry::
1660
If the file gc.log exists, then `git gc --auto` won't run
1661
unless that file is more than 'gc.logExpiry' old. Default is