diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:33 -0800 |
| commit | bcb06e204c21538067fbd232415ca704f410dbf7 (patch) | |
| tree | fe6ead034f24664dd2dfe12e2cff3318cf01bbef /Documentation | |
| parent | d08daec0011c22e6be34a29a8da5e2011385eae4 (diff) | |
| parent | 7d8e72b9700022b3d8c57c3e2be97e52c2828e70 (diff) | |
| download | git-bcb06e204c21538067fbd232415ca704f410dbf7.tar.xz | |
Merge branch 'js/fetch-multi-lockfix'
Fetching from multiple remotes into the same repository in parallel
had a bad interaction with the recent change to (optionally) update
the commit-graph after a fetch job finishes, as these parallel
fetches compete with each other. Which has been corrected.
* js/fetch-multi-lockfix:
fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
fetch: add the command-line option `--write-commit-graph`
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 43b9ff3bce..a2f78624a2 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -92,6 +92,10 @@ ifndef::git-pull[] Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default. +--[no-]write-commit-graph:: + Write a commit-graph after fetching. This overrides the config + setting `fetch.writeCommitGraph`. + -p:: --prune:: Before fetching, remove any remote-tracking references that no |