From: Junio C Hamano <redacted>
Date: Mon, 23 Jan 2017 23:59:23 +0000 (-0800)
Subject: Merge branch 'rh/diff-orderfile-doc'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=831bd5e775ad5225f2a98eba738f69148cd50e0a;p=git.git

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
---

831bd5e775ad5225f2a98eba738f69148cd50e0a