From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: [PATCH v4 1/4] Documentation: move diff.wordRegex from config.txt to diff-config.txt
Date: Tue, 13 Nov 2012 21:12:44 +0530 [thread overview]
Message-ID: <1352821367-3611-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1352821367-3611-1-git-send-email-artagnon@gmail.com>
19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
Documentation/config.txt | 6 ------
Documentation/diff-config.txt | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9a0544c..e70216d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -962,12 +962,6 @@ difftool.<tool>.cmd::
difftool.prompt::
Prompt before each invocation of the diff tool.
-diff.wordRegex::
- A POSIX Extended Regular Expression used to determine what is a "word"
- when performing word-by-word difference calculations. Character
- sequences that match the regular expression are "words", all other
- characters are *ignorable* whitespace.
-
fetch.recurseSubmodules::
This option can be either set to a boolean value or to 'on-demand'.
Setting it to a boolean changes the behavior of fetch and pull to
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 75ab8a5..decd370 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -107,6 +107,12 @@ diff.suppressBlankEmpty::
A boolean to inhibit the standard behavior of printing a space
before each empty output line. Defaults to false.
+diff.wordRegex::
+ A POSIX Extended Regular Expression used to determine what is a "word"
+ when performing word-by-word difference calculations. Character
+ sequences that match the regular expression are "words", all other
+ characters are *ignorable* whitespace.
+
diff.<driver>.command::
The custom diff driver command. See linkgit:gitattributes[5]
for details.
--
1.7.8.1.362.g5d6df.dirty
next prev parent reply other threads:[~2012-11-13 15:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <http://mid.gmane.org/1352653146-3932-1-git-send-email-artagnon@gmail.com>
2012-11-13 15:42 ` [PATCH v4 0/4] Introduce diff.submodule Ramkumar Ramachandra
2012-11-13 15:42 ` Ramkumar Ramachandra [this message]
2012-11-13 15:42 ` [PATCH v4 2/4] diff: introduce diff.submodule configuration variable Ramkumar Ramachandra
2012-11-20 0:48 ` Junio C Hamano
2012-11-22 9:40 ` Ramkumar Ramachandra
2012-11-22 9:44 ` Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 3/4] diff: rename "set" variable Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 4/4] submodule: display summary header in bold Ramkumar Ramachandra
2012-11-15 16:23 ` [PATCH v4 0/4] Introduce diff.submodule Jeff King
2012-11-15 16:25 ` Jeff King
2012-11-15 16:33 ` Jeff King
2012-11-16 10:45 ` Ramkumar Ramachandra
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=1352821367-3611-2-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/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).