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
This commit is contained in:
Junio C Hamano 2017-12-06 09:23:37 -08:00
commit 00bcc35081

View file

@ -1922,6 +1922,7 @@ _git_pull ()
--*)
__gitcomp "
--rebase --no-rebase
--autostash --no-autostash
$__git_merge_options
$__git_fetch_options
"