From: Junio C Hamano Date: Wed, 28 Mar 2018 18:04:24 +0000 (-0700) Subject: Merge branch 'nd/parseopt-completion' X-Git-Tag: v2.17.0-rc2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/87cc76fa3a79eb86136e55432bd4e4ecc84744cd?hp=--cc 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 --- 87cc76fa3a79eb86136e55432bd4e4ecc84744cd