summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-09 21:00:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-09 21:00:44 (GMT)
commit9850823f06246a235607afd295b1f9381124890e (patch)
tree035b4ab6844de26ca6f0057b3689e5b6b560e27d /Documentation
parent24ecfdf206ee0e9e01f86d333d90d281fdfd12d0 (diff)
parentb5651a2092c112140b6ab330bc6e146b8dabfca2 (diff)
downloadgit-9850823f06246a235607afd295b1f9381124890e.zip
git-9850823f06246a235607afd295b1f9381124890e.tar.gz
git-9850823f06246a235607afd295b1f9381124890e.tar.bz2
Merge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into master
"fetch.writeCommitGraph" was enabled when "feature.experimental" is asked for, but it was found to be a bit too risky even for bold folks in its current shape. The configuration has been ejected, at least for now, from the "experimental" feature set. * jn/eject-fetch-write-commit-graph-out-of-experimental: experimental: default to fetch.writeCommitGraph=false
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/feature.txt8
-rw-r--r--Documentation/config/fetch.txt3
2 files changed, 1 insertions, 10 deletions
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt
index 28c3360..c0cbf2b 100644
--- a/Documentation/config/feature.txt
+++ b/Documentation/config/feature.txt
@@ -15,14 +15,6 @@ feature.experimental::
* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
skipping more commits at a time, reducing the number of round trips.
+
-* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
-command that downloads a pack-file from a remote. Using the `--split` option,
-most executions will create a very small commit-graph file on top of the
-existing commit-graph file(s). Occasionally, these files will merge and the
-write may take longer. Having an updated commit-graph file helps performance
-of many Git commands, including `git merge-base`, `git push -f`, and
-`git log --graph`.
-+
* `protocol.version=2` speeds up fetches from repositories with many refs by
allowing the client to specify which refs to list before the server lists
them.
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index b1a9b14..b203940 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -90,5 +90,4 @@ fetch.writeCommitGraph::
the existing commit-graph file(s). Occasionally, these files will
merge and the write may take longer. Having an updated commit-graph
file helps performance of many Git commands, including `git merge-base`,
- `git push -f`, and `git log --graph`. Defaults to false, unless
- `feature.experimental` is true.
+ `git push -f`, and `git log --graph`. Defaults to false.