Merge branch 'bc/filter-branch'

* bc/filter-branch:
filter-branch.sh: support nearly proper tag name filtering

diff --cc Documentation/git-filter-branch.txt
Simple merge

diff --cc git-filter-branch.sh
Simple merge

diff --cc t/t7003-filter-branch.sh
Simple merge