diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2010-11-30 09:29:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 14:47:51 -0800 |
| commit | f4b05a4947f5f1cf3e01fb61ec5919cc28fe11f7 (patch) | |
| tree | bb5767eab63de6cf62368351aa289547cccd18f3 /Documentation/gitattributes.txt | |
| parent | dee40e5178bab78aaf655ee4323f3141acd17654 (diff) | |
| download | git-f4b05a4947f5f1cf3e01fb61ec5919cc28fe11f7.tar.gz | |
Make the tab width used for whitespace checks configurable
A new whitespace "rule" is added that sets the tab width to use for
whitespace checks and fix-ups and replaces the hard-coded constant 8.
Since the setting is part of the rules, it can be set per file using
.gitattributes.
The new configuration is backwards compatible because older git versions
simply ignore unknown whitespace rules.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index c80ca5da43..5a7f936429 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -723,6 +723,8 @@ control per path. Set:: Notice all types of potential whitespace errors known to git. + The tab width is taken from the value of the `core.whitespace` + configuration variable. Unset:: @@ -730,13 +732,13 @@ Unset:: Unspecified:: - Use the value of `core.whitespace` configuration variable to + Use the value of the `core.whitespace` configuration variable to decide what to notice as error. String:: Specify a comma separate list of common whitespace problems to - notice in the same format as `core.whitespace` configuration + notice in the same format as the `core.whitespace` configuration variable. |