Junio C Hamano <gitster@xxxxxxxxx> 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@xxxxxxxxx> 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). -- 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
