summaryrefslogtreecommitdiff
path: root/contrib/diff-highlight
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-26 15:32:27 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-08 10:05:27 +0900
commite9282f02b2f21118f3383608718e38efc3d967e1 (patch)
tree94a5166a027c9306b3d8eba594ea9b79347dc1c2 /contrib/diff-highlight
parentxdiff: reassign xpparm_t.flags bits (diff)
downloadtgif-e9282f02b2f21118f3383608718e38efc3d967e1.tar.xz
diff: --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 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions