diff options
| author | Stefan Beller <sbeller@google.com> | 2018-07-16 16:05:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-17 11:25:31 -0700 |
| commit | 51da15eb2301667c6ac01dd18851b7a424fbf2b1 (patch) | |
| tree | 4d19e188779d5d495f04bdfa80bfa4a41052c59c /diff.h | |
| parent | ee1df66f7cfd0f37bb0e235c4f7ef12bd09a8d2d (diff) | |
| download | git-51da15eb2301667c6ac01dd18851b7a424fbf2b1.tar.gz | |
diff.c: add a blocks mode for moved code detection
The new "blocks" mode provides a middle ground between plain and zebra.
It is as intuitive (few colors) as plain, but still has the requirement
for a minimum of lines/characters to count a block as moved.
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
(https://public-inbox.org/git/87o9j0uljo.fsf@evledraar.gmail.com/)
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -208,8 +208,9 @@ struct diff_options { enum { COLOR_MOVED_NO = 0, COLOR_MOVED_PLAIN = 1, - COLOR_MOVED_ZEBRA = 2, - COLOR_MOVED_ZEBRA_DIM = 3, + COLOR_MOVED_BLOCKS = 2, + COLOR_MOVED_ZEBRA = 3, + COLOR_MOVED_ZEBRA_DIM = 4, } color_moved; #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA #define COLOR_MOVED_MIN_ALNUM_COUNT 20 |