Merge branch 'tc/smart-http-post-redirect' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 82e6609689d7a72ff28420a1ee23923194e91c36..d3037fc94eb027e5067b0371da2b33081fd89da5 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1125,7 +1125,7 @@ _git_diff ()
        case "$cur" in
        --*)
                __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-                       --base --ours --theirs
+                       --base --ours --theirs --no-index
                        $__git_diff_common_options
                        "
                return