path: root/Documentation/gitattributes.txt
diff options
authorJunio C Hamano <>2007-12-09 09:23:48 (GMT)
committerJunio C Hamano <>2007-12-09 09:23:48 (GMT)
commit4eb39e9bcccc54eb23af8a7e2676c63e5bf32866 (patch)
treec6a62b68b86275d7db7bda65fa448c92feeba130 /Documentation/gitattributes.txt
parent05e74f4111b5ce5995dd1145f83398fe40a318e0 (diff)
parentcf1b7869f0c571bbd4f72a4355d9aca558baa0da (diff)
Merge branch 'jc/spht'
* jc/spht: Use gitattributes to define per-path whitespace rule core.whitespace: documentation updates. builtin-apply: teach whitespace_rules builtin-apply: rename "whitespace" variables and fix styles core.whitespace: add test for diff whitespace error highlighting git-diff: complain about >=8 consecutive spaces in initial indent War on whitespace: first, a bit of retreat. Conflicts: cache.h config.c diff.c
Diffstat (limited to 'Documentation/gitattributes.txt')
1 files changed, 31 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 19bd25f..71c7ad7 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -361,6 +361,37 @@ When left unspecified, the driver itself is used for both
internal merge and the final merge.
+Checking whitespace errors
+The `core.whitespace` configuration variable allows you to define what
+`diff` and `apply` should consider whitespace errors for all paths in
+the project (See gitlink:git-config[1]). This attribute gives you finer
+control per path.
+ Notice all types of potential whitespace errors known to git.
+ Do not notice anything as error.
+ Use the value of `core.whitespace` configuration variable to
+ decide what to notice as error.
+ Specify a comma separate list of common whitespace problems to
+ notice in the same format as `core.whitespace` configuration
+ variable.