diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:38 -0700 |
commit | 36fec2aa00f2ef6f45ec6083c447ff85b0d1ebbe (patch) | |
tree | 1c9275380f83520fd022f57abeae4afc7105f8cc /Documentation/git-commit-graph.txt | |
parent | Merge branch 'cb/bisect-replay-with-dos-fix' (diff) | |
parent | git-sparse-checkout.txt: add missing ' (diff) | |
download | tgif-36fec2aa00f2ef6f45ec6083c447ff85b0d1ebbe.tar.xz |
Merge branch 'ma/doc-fixes'
Various doc fixes.
* ma/doc-fixes:
git-sparse-checkout.txt: add missing '
git-credential.txt: use list continuation
git-commit-graph.txt: fix list rendering
git-commit-graph.txt: fix grammo
date-formats.txt: fix list continuation
Diffstat (limited to 'Documentation/git-commit-graph.txt')
-rw-r--r-- | Documentation/git-commit-graph.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index 53a650225a..a3d996787b 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -58,7 +58,7 @@ With the `--append` option, include all commits that are present in the existing commit-graph file. + With the `--changed-paths` option, compute and write information about the -paths changed between a commit and it's first parent. This operation can +paths changed between a commit and its 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>`. + @@ -68,6 +68,7 @@ chain of multiple commit-graph files stored in 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 |