]> git.ipfire.org Git - thirdparty/git.git/commit - contrib/completion/git-completion.bash
diff: --ignore-cr-at-eol
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Oct 2017 06:32:27 +0000 (15:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Nov 2017 01:05:27 +0000 (10:05 +0900)
commite9282f02b2f21118f3383608718e38efc3d967e1
tree94a5166a027c9306b3d8eba594ea9b79347dc1c2
parent446d12cb3fbee1b641f97336df3abe8968e3db59
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>
Documentation/diff-options.txt
Documentation/merge-strategies.txt
contrib/completion/git-completion.bash
diff.c
merge-recursive.c
t/t4015-diff-whitespace.sh
xdiff/xdiff.h
xdiff/xutils.c