Merge branch 'nd/diff-with-path-params' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 111b05302bc79bee26c1009b841f289127f024a3..69568075191af7b22fc4e9e556cdcd3c19dc7a51 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -664,6 +664,7 @@ __git_list_porcelain_commands ()
                check-mailmap)    : plumbing;;
                check-ref-format) : plumbing;;
                checkout-index)   : plumbing;;
+               column)           : internal helper;;
                commit-tree)      : plumbing;;
                count-objects)    : infrequent;;
                credential)       : credentials;;
@@ -1716,7 +1717,7 @@ _git_send_email ()
        --to|--cc|--bcc|--from)
                __gitcomp "
                $(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
-               " "" ""
+               "
                return
                ;;
        esac