diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-26 15:32:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-08 10:05:27 +0900 |
| commit | e9282f02b2f21118f3383608718e38efc3d967e1 (patch) | |
| tree | 94a5166a027c9306b3d8eba594ea9b79347dc1c2 /xdiff/xdiff.h | |
| parent | 446d12cb3fbee1b641f97336df3abe8968e3db59 (diff) | |
| download | git-e9282f02b2f21118f3383608718e38efc3d967e1.tar.gz | |
diff: --ignore-cr-at-eoljc/ignore-cr-at-eol
A new option --ignore-cr-at-eol tells the diff machinery to treat a
carriage-return at the end of a (complete) line as if it does not
exist.
Just like other "--ignore-*" options to ignore various kinds of
whitespace differences, this will help reviewing the real changes
you made without getting distracted by spurious CRLF<->LF conversion
made by your editor program.
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
[jch: squashed in command line completion by Dscho]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index cbf5d8e166..51f8926215 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -33,9 +33,11 @@ extern "C" { #define XDF_IGNORE_WHITESPACE (1 << 1) #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3) +#define XDF_IGNORE_CR_AT_EOL (1 << 4) #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \ XDF_IGNORE_WHITESPACE_CHANGE | \ - XDF_IGNORE_WHITESPACE_AT_EOL) + XDF_IGNORE_WHITESPACE_AT_EOL | \ + XDF_IGNORE_CR_AT_EOL) #define XDF_IGNORE_BLANK_LINES (1 << 7) |