Merge branch 'tz/complete-tag-delete-tagname' into next

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d345d1fe0c3957c2744989c6758c79cffe0f52cb..c7957f0a90b3ccc62f0ded999c34c963f320419b 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1945,7 +1945,7 @@ _git_rebase ()
        --*)
                __gitcomp "
                        --onto --merge --strategy --interactive
-                       --recreate-merges --preserve-merges --stat --no-stat
+                       --preserve-merges --stat --no-stat
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
                        --autosquash --no-autosquash
@@ -2116,7 +2116,7 @@ _git_config ()
                return
                ;;
        branch.*.rebase)
-               __gitcomp "false true recreate preserve interactive"
+               __gitcomp "false true preserve interactive"
                return
                ;;
        remote.pushdefault)
@@ -2967,7 +2967,7 @@ _git_tag ()
        while [ $c -lt $cword ]; do
                i="${words[c]}"
                case "$i" in
-               -d|-v)
+               -d|--delete|-v|--verify)
                        __gitcomp_direct "$(__git_tags "" "$cur" " ")"
                        return
                        ;;