Merge branch 'dg/filter-branch-filter-order-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:45 +0000 (14:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:45 +0000 (14:45 +0900)
commite336afdfb67384aa058eeb47687545f0492ed40c
treea417db3628b605e716b54cf2e0a01d5a00d7622b
parent39a2aeacc5c606b6b9a4c5b8397b02c35c38ae5f
parent07c4984508865984fdfdedf2e1cdf86328221af4
Merge branch 'dg/filter-branch-filter-order-doc'

Update the documentation for "git filter-branch" so that the filter
options are listed in the same order as they are applied, as
described in an earlier part of the doc.

* dg/filter-branch-filter-order-doc:
  doc: list filter-branch subdirectory-filter first
Documentation/git-filter-branch.txt
git-filter-branch.sh