Merge branch 'ac/complete-pull-autostash'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:23:37 +0000 (09:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:23:37 +0000 (09:23 -0800)
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

1  2 
contrib/completion/git-completion.bash