Andrew's git / gitweb.git / diff
?
Merge branch 'nd/parseopt-completion'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 18:04:24 +0000 (11:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2018 18:04:24 +0000 (11:04 -0700)
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

1  2 
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-completion.bash
Simple merge