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)
commit6366dd9...00a3f67e47a30d94375a88dabc18ec6f
tree1ebaba6...306b8fe1466f2a39f283e61a2640e7fdcopy hash to clipboard (tree)
parent4e51984...825a8bc397333bbb946f71f491abf796copy hash to clipboard (diff)
parent46af107...def7bd9892bf504aa874d24f826dd4bacopy hash to clipboard (diff)
Documentation/diff-options.txt