summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-27 02:06:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-27 02:06:31 (GMT)
commit10f65c239a885336b745cc9d2e1654980ffef41e (patch)
treef10ffd064f85e27f3ff8b64e0d26e179df8bca77 /Documentation/diff-options.txt
parent14c63a9dc093d6738454f6369a4f5663ca732cf7 (diff)
parente9282f02b2f21118f3383608718e38efc3d967e1 (diff)
downloadgit-10f65c239a885336b745cc9d2e1654980ffef41e.zip
git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.gz
git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.bz2
Merge branch 'jc/ignore-cr-at-eol'
The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits
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 dd0dba5..3c93c21 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -557,6 +557,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.