projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e11c826 874444b)
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)
commit831bd5e775ad5225f2a98eba738f69148cd50e0a
tree305316a46768a32e9559a734fdbf25295d632705tree | snapshot
parente11c8261ba70f16b86ec662c027c9be649d9aea4commit | diff
parent874444b70451879d5b9b7e288e5c4e711c4a87accommit | diff
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/diff-config.txt diff1 | diff2 | blob | history
Documentation/diff-options.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.