diff options
author | Elijah Newren <newren@gmail.com> | 2022-08-19 04:28:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 10:45:07 -0700 |
commit | 11ea33ce444f929908990ec24c58d848373bdda3 (patch) | |
tree | 1d62a6a931c3622a29241ca180a140233ce3a5a9 /Documentation/rev-list-options.txt | |
parent | 9bf691b78cf906751e65d65ba0c6ffdcd9a5a12c (diff) | |
download | git-11ea33ce444f929908990ec24c58d848373bdda3.tar.gz |
rev-list-options.txt: fix simple typo
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rev-list-options.txt')
-rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 195e74eec6..2f85726745 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -659,7 +659,7 @@ Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in -parallel and merge their topic branches along a single trunk: manu +parallel and merge their topic branches along a single trunk: many unrelated merges appear in the `--full-history` results. When using the `--simplify-merges` option, the commits `O` and `P` |