Merge branch 'rh/diff-orderfile-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:23 +0000 (15:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2017 23:59:23 +0000 (15:59 -0800)
commit831bd5e...75ad5225f2a98eba738f69148cd50e0a
tree305316a...6768a32e9559a734fdbf25295d632705copy hash to clipboard (tree)
parente11c826...ba70f16b86ec662c027c9be649d9aea4copy hash to clipboard (diff)
parent874444b...0451879d5b9b7e288e5c4e711c4a87accopy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/diff-options.txt