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