Merge branch 'ah/filter-branch-setup'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2017 21:15:21 +0000 (14:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2017 21:15:21 +0000 (14:15 -0700)
"filter-branch" learned a pseudo filter "--setup" that can be used
to define a common function/variable that can be used by other
filters.

* ah/filter-branch-setup:
filter-branch: add [--] to usage
filter-branch: add `--setup` step

Trivial merge