From: Junio C Hamano <gitster@pobox•com>
To: Nanako Shiraishi <nanako3@lavabit•com>
Cc: "Peter Valdemar Mørch (Lists)" <4ux6as402@sneakemail•com>,
git@vger•kernel.org
Subject: Re: [PATCH] Document disabling core.whitespace values trailing-space and space-before-tab
Date: Fri, 25 Jul 2008 01:49:43 -0700 [thread overview]
Message-ID: <7v3alyuz4o.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vbq0m608w.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 24 Jul 2008 21:44:47 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Various "values" given to the whitespace attribute actually act as if they
> are sub-variables and obey the similar "[-]name" rule, but (1) that is
> left unsaid, and (2) in that context '!' does not make sense so only '-'
> has any meaning.
Actually I take it back. "!name to revert to unspecified and -name to unset"
really is about name; values to whitespace do not work like "sub-variables"
at all.
> So I think Peter's patch is going in the right direction.
I've committed a much more simplified version.
-- >8 --
[PATCH] Documentation: clarify how to diable elements in core.whitespace
Noticed by Peter Valdemar Mørch.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e784805..798b551 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -358,7 +358,8 @@ core.whitespace::
A comma separated list of common whitespace problems to
notice. 'git-diff' will use `color.diff.whitespace` to
highlight them, and 'git-apply --whitespace=error' will
- consider them as errors:
+ consider them as errors. You can prefix `-` to disable
+ any of them (e.g. `-trailing-space`):
+
* `trailing-space` treats trailing whitespaces at the end of the line
as an error (enabled by default).
next prev parent reply other threads:[~2008-07-25 8:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 5:34 [PATCH] Document disabling core.whitespace values trailing-space and space-before-tab "Peter Valdemar Mørch (Lists)"
2008-07-24 8:29 ` Nanako Shiraishi
2008-07-24 9:41 ` "Peter Valdemar Mørch (Lists)"
2008-07-25 4:44 ` Junio C Hamano
2008-07-25 6:11 ` Peter Valdemar Mørch
2008-07-25 6:13 ` "Peter Valdemar Mørch (Lists)"
2008-07-25 8:49 ` Junio C Hamano [this message]
2008-07-25 7:28 ` Junio C Hamano
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=7v3alyuz4o.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=4ux6as402@sneakemail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=nanako3@lavabit$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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