From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Jakub Narebski <jnareb@gmail.com>,
"Helped-by: Michael J Gruber" <git@drmicha.warpmail.net>
Subject: [PATCH v3 0/3] Document diff and filter drivers in config
Date: Sun, 3 Apr 2011 19:55:19 +0530 [thread overview]
Message-ID: <1301840722-24344-1-git-send-email-artagnon@gmail.com> (raw)
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
next prev parent reply other threads:[~2011-04-03 14:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 8:47 [PATCH] Documentation: Document diff.<tool>.* and filter.<driver>.* in config Ramkumar Ramachandra
2011-04-01 9:18 ` Jakub Narebski
2011-04-01 10:43 ` [PATCH v2] " Ramkumar Ramachandra
2011-04-01 13:50 ` Jakub Narebski
2011-04-01 13:56 ` Michael J Gruber
2011-04-03 14:25 ` Ramkumar Ramachandra [this message]
2011-04-03 14:25 ` [PATCH 1/3] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-04 8:46 ` Michael J Gruber
2011-04-03 14:25 ` [PATCH 2/3] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-04 8:54 ` Michael J Gruber
2011-04-04 17:24 ` Junio C Hamano
2011-04-03 14:25 ` [PATCH 3/3] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-04 8:55 ` Michael J Gruber
2011-04-06 9:57 ` [PATCH v4 0/4] Document diff and filter drivers in config Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 1/4] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-06 11:27 ` Michael J Gruber
2011-04-06 12:51 ` Ramkumar Ramachandra
2011-04-06 16:50 ` Junio C Hamano
2011-04-06 18:09 ` Ramkumar Ramachandra
2011-04-07 11:57 ` Michael J Gruber
2011-04-07 16:19 ` Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 2/4] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 3/4] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-06 9:57 ` [PATCH 4/4] Documentation: Minor language improvements to merge-config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH v5 0/4] Document diff and filter drivers in config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 1/4] Documentation: Add filter.<driver>.* to config Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 2/4] Documentation: Add diff.<driver>.* " Ramkumar Ramachandra
2011-04-06 19:48 ` Junio C Hamano
2011-04-07 3:03 ` Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 3/4] Documentation: Allow custom diff tools to be specified in 'diff.tool' Ramkumar Ramachandra
2011-04-06 18:46 ` [PATCH 4/4] Documentation: Minor language improvements to merge-config Ramkumar Ramachandra
2011-04-07 12:47 ` [PATCH v4 0/4] Document diff and filter drivers in config Michael J Gruber
2011-04-07 12:48 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1301840722-24344-1-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).