Merge branch 'jc/doc-diff-filter-exclude'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:41 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:41 +0000 (14:13 -0700)
commitc3531e03856972b698df61c983a3375892220d51
tree4d47308eda9807138c0b3e9b8af31f6d04708ced
parent976809a8e202d40bc32adc4fff0c0b5056f89fca
parent16726cfa0c3ad5d0d261bd7068014e659cb989da
Merge branch 'jc/doc-diff-filter-exclude'

Belated doc update for a feature added in v1.8.5.

* jc/doc-diff-filter-exclude:
  diff: document diff-filter exclusion
Documentation/diff-options.txt