Changes from v1: * Don't reference gitignore for the file format because they're not quite the same. Richard Hansen (2): diff: document behavior of relative diff.orderFile diff: document the format of the -O (diff.orderFile) file Documentation/diff-config.txt | 7 +++--- Documentation/diff-options.txt | 54 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-) -- 2.11.0.390.gc69c2f50cf-goog