diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:04 -0700 |
| commit | 0b9635847944f97079fc6c2283063cd3a0ed0271 (patch) | |
| tree | a6bf49bea76fa9cd5d700657f7beeea150714f7d /Documentation/diff-options.txt | |
| parent | b6c4058f978433c51581df87283309b611bde87b (diff) | |
| parent | f0b8fb6e591b50b72b921f2c4cf120ebd284f510 (diff) | |
| download | git-0b9635847944f97079fc6c2283063cd3a0ed0271.tar.gz | |
Merge branch 'jt/diff-color-move-fix'
A handful of bugfixes and an improvement to "diff --color-moved".
* jt/diff-color-move-fix:
diff: define block by number of alphanumeric chars
diff: respect MIN_BLOCK_LENGTH for last block
diff: avoid redundantly clearing a flag
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b1ab96477b..a88c76741e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -254,13 +254,11 @@ plain:: moved line, but it is not very useful in a review to determine if a block of code was moved without permutation. zebra:: - Blocks of moved code are detected greedily. The detected blocks are + Blocks of moved text of at least 20 alphanumeric characters + are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between - the two colors indicates that a new block was detected. If there - are fewer than 3 adjacent moved lines, they are not marked up - as moved, but the regular colors 'color.diff.{old,new}' will be - used. + the two colors indicates that a new block was detected. dimmed_zebra:: Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent |