Merge branch 'jc/ignore-cr-at-eol'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f07f16b28fe80de32ebc0431b5d1d8f5a64e19d8..38d5e4a909f0386be18eeb0d3eec768d95dcc74f 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1400,7 +1400,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
                        --patch-with-stat --name-only --name-status --color
                        --no-color --color-words --no-renames --check
                        --full-index --binary --abbrev --diff-filter=
-                       --find-copies-harder
+                       --find-copies-harder --ignore-cr-at-eol
                        --text --ignore-space-at-eol --ignore-space-change
                        --ignore-all-space --ignore-blank-lines --exit-code
                        --quiet --ext-diff --no-ext-diff