From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sun, 03 Apr 2011 14:25:19 GMT
Subject: [PATCH v3 0/3] Document diff and filter drivers in config
Message-ID: <1301840722-24344-1-git-send-email-artagnon@gmail.com>
In-Reply-To: <1301654600-8901-1-git-send-email-artagnon@gmail.com>

What changed since v2:
- I decided to move the diff.* configuration options into a dedicated
  diff-config.txt, corresponding to merge-config.txt.
- The placeholder <driver> is much less confusing than <tool> (see
  difftool.* family) -- thanks to Michael for that.
- Language is much nicer now- thanks to Michael again.
- The deprecated `funcname` is excluded now. Thanks to Jakub.
- There's one extra patch; a small inconsistency that I happened to
  come across while comparing diff-config.txt with merge-config.txt.

Thanks for reading.

-- Ram

Ramkumar Ramachandra (3):
  Documentation: Add filter.<driver>.* to config
  Documentation: Add diff.<driver>.* to config
  Documentation: Allow custom diff tools to be specified in 'diff.tool'

 Documentation/config.txt      |   73 +++++---------------------------
 Documentation/diff-config.txt |   93 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 62 deletions(-)
 create mode 100644 Documentation/diff-config.txt

-- 
1.7.4.rc1.7.g2cf08.dirty