Merge branch 'jk/doc-diff-options'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 22:32:57 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 22:32:57 +0000 (14:32 -0800)
Doc update.

* jk/doc-diff-options:
  docs/diff-options: clarify scope of diff-filter types

1  2 
Documentation/diff-options.txt

Simple merge