Merge branch 'jk/doc-diff-options'

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

Junio C Hamano committed Jan 9, 2018 at 14:32 UTC 6366dd9000a3f67e47a30d94375a88dabc18ec6f

No changes.