diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
| commit | d12166d3c8bb12d5a1638c870fc590c4e300a413 (patch) | |
| tree | e7966e82f4d5bb09686cea32472b7075e3130ce5 /Documentation/gitdiffcore.txt | |
| parent | 5edbcead426056b54286499149244ae4cbf8b5f7 (diff) | |
| parent | 5fbcdb2082ab5e154133048547c8f60c418b875c (diff) | |
| download | git-d12166d3c8bb12d5a1638c870fc590c4e300a413.tar.xz | |
Merge branch 'en/docfixes'
Documentation typo and grammo fixes.
* en/docfixes: (25 commits)
documentation: add missing parenthesis
documentation: add missing quotes
documentation: add missing fullstops
documentation: add some commas where they are helpful
documentation: fix whitespace issues
documentation: fix capitalization
documentation: fix punctuation
documentation: use clearer prepositions
documentation: add missing hyphens
documentation: remove unnecessary hyphens
documentation: add missing article
documentation: fix choice of article
documentation: whitespace is already generally plural
documentation: fix singular vs. plural
documentation: fix verb vs. noun
documentation: fix adjective vs. noun
documentation: fix verb tense
documentation: employ consistent verb tense for a list
documentation: fix subject/verb agreement
documentation: remove extraneous words
...
Diffstat (limited to 'Documentation/gitdiffcore.txt')
| -rw-r--r-- | Documentation/gitdiffcore.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 0d57f86abc..3cda2e07c2 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -173,7 +173,7 @@ Note that when rename detection is on but both copy and break detection are off, rename detection adds a preliminary step that first checks if files are moved across directories while keeping their filename the same. If there is a file added to a directory whose -contents is sufficiently similar to a file with the same name that got +contents are sufficiently similar to a file with the same name that got deleted from a different directory, it will mark them as renames and exclude them from the later quadratic step (the one that pairwise compares all unmatched files to find the "best" matches, determined by @@ -213,7 +213,7 @@ from the original, and does not count insertion. If you removed only 10 lines from a 100-line document, even if you added 910 new lines to make a new 1000-line document, you did not do a complete rewrite. diffcore-break breaks such a case in order to -help diffcore-rename to consider such filepairs as candidate of +help diffcore-rename to consider such filepairs as a candidate of rename/copy detection, but if filepairs broken that way were not matched with other filepairs to create rename/copy, then this transformation merges them back into the original @@ -230,13 +230,13 @@ like these: * -B/60 (the same as above, since diffcore-break defaults to 50%). -Note that earlier implementation left a broken pair as a separate -creation and deletion patches. This was an unnecessary hack and +Note that earlier implementation left a broken pair as separate +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 -a complete rewrite by showing the entire contents of old version -prefixed with '-', followed by the entire contents of new +a complete rewrite by showing the entire contents of the old version +prefixed with '-', followed by the entire contents of the new version prefixed with '+'. @@ -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 |
