Andrew's git / gitweb.git / diff
?
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)
Documentation fix.

* rh/diff-orderfile-doc:
diff: document the format of the -O (diff.orderFile) file
diff: document behavior of relative diff.orderFile

1  2 
Documentation/diff-config.txt patch | diff1 | diff2 | blob | history
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/diff-config.txt
Simple merge
diff --cc Documentation/diff-options.txt
Simple merge