What changed since v4: - I included the wrong commit in 1/4 last time. - More nits and proof-reading. -- Ram Ramkumar Ramachandra (4): Documentation: Add filter.<driver>.* to config Documentation: Add diff.<driver>.* to config Documentation: Allow custom diff tools to be specified in 'diff.tool' Documentation: Minor language improvements to merge-config Documentation/config.txt | 73 +++++--------------------------- Documentation/diff-config.txt | 92 ++++++++++++++++++++++++++++++++++++++++ Documentation/merge-config.txt | 39 +++++++++-------- 3 files changed, 123 insertions(+), 81 deletions(-) create mode 100644 Documentation/diff-config.txt -- 1.7.4.rc1.7.g2cf08.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html