summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-26 06:32:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-08 01:05:27 (GMT)
commite9282f02b2f21118f3383608718e38efc3d967e1 (patch)
tree94a5166a027c9306b3d8eba594ea9b79347dc1c2 /Documentation/diff-options.txt
parent446d12cb3fbee1b641f97336df3abe8968e3db59 (diff)
downloadgit-e9282f02b2f21118f3383608718e38efc3d967e1.zip
git-e9282f02b2f21118f3383608718e38efc3d967e1.tar.gz
git-e9282f02b2f21118f3383608718e38efc3d967e1.tar.bz2
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 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 89cc0f4..aa2c0ff 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -519,6 +519,9 @@ endif::git-format-patch[]
--text::
Treat all files as text.
+--ignore-cr-at-eol::
+ Ignore carrige-return at the end of line when doing a comparison.
+
--ignore-space-at-eol::
Ignore changes in whitespace at EOL.