| commit | 831bd5e775ad5225f2a98eba738f69148cd50e0a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Jan 2017 23:59:23 +0000 (23 15:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Jan 2017 23:59:23 +0000 (23 15:59 -0800) | ||
| tree | 305316a46768a32e9559a734fdbf25295d632705 | treesnapshot (tar.gz zip) |
| parent | e11c8261ba70f16b86ec662c027c9be649d9aea4 | commitdiff |
| parent | 874444b70451879d5b9b7e288e5c4e711c4a87ac | commitdiff |
Merge branch 'rh/diff-orderfile-doc'
Documentation fix.
* rh/diff-orderfile-doc:
diff: document the format of the -O (diff.orderFile) file
diff: document behavior of relative diff.orderFile
Documentation fix.
* rh/diff-orderfile-doc:
diff: document the format of the -O (diff.orderFile) file
diff: document behavior of relative diff.orderFile
| Documentation/diff-config.txt | diff1 | diff2 | blobhistory |
| Documentation/diff-options.txt | diff1 | diff2 | blobhistory |