Merge branch 'js/patience-diff'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 703f4c2e90b034a996d993632a81553de02ceda8..81f70ec6449f3c15f26884040cdfe9e9cad489eb 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -783,6 +783,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=
                        --inter-hunk-context=
+                       --patience
                        --raw
 "