Merge branch 'nd/parseopt-completion'
commit87cc76fa3a79eb86136e55432bd4e4ecc84744cd
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 18:04:24 +0000 (28 11:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 18:04:24 +0000 (28 11:04 -0700)
treeee6f7060615a519bc5a7454e4d382b19b7ec2fed
parent90bbd502d54fe920356fa9278055dc9c9bfe9a56
parentb60e88cc780ea54de65b62437afbeb9c857110f2
Merge branch 'nd/parseopt-completion'

Hotfix for recently graduated topic that give help to completion
scripts from the Git subcommands that are being completed

* nd/parseopt-completion:
  t9902: disable test on the list of merge-strategies under GETTEXT_POISON
  completion: clear cached --options when sourcing the completion script
contrib/completion/git-completion.bash