diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:44 -0700 |
| commit | 4d542687fcea27c6cce9a79415ad8cb1a817697c (patch) | |
| tree | e72600a6fffb78f19714ea08ea4212cedf0c1258 /Documentation/gitdiffcore.txt | |
| parent | 42bdb80a084f1405f2e57394146c977ad4f3b75a (diff) | |
| download | git-4d542687fcea27c6cce9a79415ad8cb1a817697c.tar.gz | |
documentation: add some commas where they are helpful
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitdiffcore.txt')
| -rw-r--r-- | Documentation/gitdiffcore.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index bc65f91310..3cda2e07c2 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -231,7 +231,7 @@ like these: * -B/60 (the same as above, since diffcore-break defaults to 50%). Note that earlier implementation left a broken pair as separate -creation and deletion patches. This was an unnecessary hack and +creation and deletion patches. This was an unnecessary hack, and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such @@ -263,7 +263,7 @@ textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what rename-detection considers the same file) moves, which is noise. The implementation runs diff twice and greps, and this can be quite -expensive. To speed things up binary files without textconv filters +expensive. To speed things up, binary files without textconv filters will be ignored. When `-S` or `-G` are used without `--pickaxe-all`, only filepairs |