Sync with maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index dd0dba5b1d1951e762f0a43f1b2476bfa1029ad9..3c93c216831e722ec9b8b8a231f455df328e7fe2 100644 (file)
--- 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.