diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:31 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:31 +0900 |
commit | 10f65c239a885336b745cc9d2e1654980ffef41e (patch) | |
tree | f10ffd064f85e27f3ff8b64e0d26e179df8bca77 /Documentation/diff-options.txt | |
parent | 14c63a9dc093d6738454f6369a4f5663ca732cf7 (diff) | |
parent | e9282f02b2f21118f3383608718e38efc3d967e1 (diff) | |
download | git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.gz |
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.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index dd0dba5b1d..3c93c21683 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. |