OSDN Git Service

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)
commit6366dd9000a3f67e47a30d94375a88dabc18ec6f
tree1ebaba69306b8fe1466f2a39f283e61a2640e7fd
parent4e51984e825a8bc397333bbb946f71f491abf796
parent46af107bdef7bd9892bf504aa874d24f826dd4ba
Merge branch 'jk/doc-diff-options'

Doc update.

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