summaryrefslogtreecommitdiffstats
path: root/git-commit-graph.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-01 14:53:51 -0700
committerJunio C Hamano <gitster@pobox.com>2020-05-01 14:53:51 -0700
commit864182b6457faf2455894d9a200acda0751f3c80 (patch)
tree06ab5e096eab9ff6ae4bcb46ce9f1c2515f43ff0 /git-commit-graph.txt
parent67cc2b7cdda7af3a7079b399a8a154d094efc649 (diff)
downloadgit-htmldocs-864182b6457faf2455894d9a200acda0751f3c80.tar.gz
Autogenerated HTML docs for v2.26.2-533-gb34789
Diffstat (limited to 'git-commit-graph.txt')
-rw-r--r--git-commit-graph.txt22
1 files changed, 17 insertions, 5 deletions
diff --git a/git-commit-graph.txt b/git-commit-graph.txt
index 28d1fee50..53a650225 100644
--- a/git-commit-graph.txt
+++ b/git-commit-graph.txt
@@ -57,11 +57,23 @@ or `--stdin-packs`.)
With the `--append` option, include all commits that are present in the
existing commit-graph file.
+
-With the `--split` option, write the commit-graph as a chain of multiple
-commit-graph files stored in `<dir>/info/commit-graphs`. The new commits
-not already in the commit-graph are added in a new "tip" file. This file
-is merged with the existing file if the following merge conditions are
-met:
+With the `--changed-paths` option, compute and write information about the
+paths changed between a commit and it's first parent. This operation can
+take a while on large repositories. It provides significant performance gains
+for getting history of a directory or a file with `git log -- <path>`.
++
+With the `--split[=<strategy>]` option, write the commit-graph as a
+chain of multiple commit-graph files stored in
+`<dir>/info/commit-graphs`. Commit-graph layers are merged based on the
+strategy and other splitting options. The new commits not already in the
+commit-graph are added in a new "tip" file. This file is merged with the
+existing file if the following merge conditions are met:
+* If `--split=no-merge` is specified, a merge is never performed, and
+the remaining options are ignored. `--split=replace` overwrites the
+existing chain with a new one. A bare `--split` defers to the remaining
+options. (Note that merging a chain of commit graphs replaces the
+existing chain with a length-1 chain where the first and only
+incremental holds the entire graph).
+
* If `--size-multiple=<X>` is not specified, let `X` equal 2. If the new
tip file would have `N` commits and the previous tip has `M` commits and