Merge branch 'ac/complete-pull-autostash'

The shell completion (in contrib/) learned that "git pull" can take
the "--autostash" option.

* ac/complete-pull-autostash:
completion: add --autostash and --no-autostash to pull

diff --combined contrib/completion/git-completion.bash
index 35df6ce9ea3f37c36e4df78929758dd1a818712e,be9cf0acc0315b31b9d8e9cba662e5c9368d75f7..3683c772c5586ccc1f6dfc8c047919d8d96aa891
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1204,7 -1204,7 +1204,7 @@@ _git_branch (
                        --color --no-color --verbose --abbrev= --no-abbrev
                        --track --no-track --contains --no-contains --merged --no-merged
                        --set-upstream-to= --edit-description --list
 -                      --unset-upstream --delete --move --remotes
 +                      --unset-upstream --delete --move --copy --remotes
                        --column --no-column --sort= --points-at
                        "
                ;;
@@@ -1400,7 -1400,7 +1400,7 @@@ __git_diff_common_options="--stat --num
                        --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
@@@ -1922,6 -1922,7 +1922,7 @@@ _git_pull (
        --*)
                __gitcomp "
                        --rebase --no-rebase
+                       --autostash --no-autostash
                        $__git_merge_options
                        $__git_fetch_options
                "
@@@ -2641,7 -2642,6 +2642,7 @@@ _git_config (
                sendemail.suppressfrom
                sendemail.thread
                sendemail.to
 +              sendemail.tocmd
                sendemail.validate
                sendemail.smtpbatchsize
                sendemail.smtprelogindelay