Merge branch 'vs/complete-stash-show-p-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jun 2020 01:06:29 +0000 (18:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jun 2020 01:06:29 +0000 (18:06 -0700)
commita8ecd0190d743f19d20917197f95317955354941
tree1af53fca7e09fe57e7fbcf5c245917a2fdf37250
parent7e75aeb290b5f0d858019359fee4e0132637c726
parentfffd0cf520718fcd0315bc5e0ee7a6d4762b96b4
Merge branch 'vs/complete-stash-show-p-fix'

The command line completion script (in contrib/) tried to complete
"git stash -p" as if it were "git stash push -p", but it was too
aggressive and also affected "git stash show -p", which has been
corrected.

* vs/complete-stash-show-p-fix:
  completion: don't override given stash subcommand with -p
contrib/completion/git-completion.bash