Permalink
Browse files

Merge branch 'maint'

* maint:
  Documentation: git diff --check respects core.whitespace
  • Loading branch information...
2 parents 2765233 + 4f83039 commit def98035d00c57bb8723e7859366536504eb56aa @gitster gitster committed Jun 22, 2011
Showing with 8 additions and 4 deletions.
  1. +8 −4 Documentation/diff-options.txt
View
12 Documentation/diff-options.txt
@@ -224,10 +224,14 @@ endif::git-format-patch[]
ifndef::git-format-patch[]
--check::
- Warn if changes introduce trailing whitespace
- or an indent that uses a space before a tab. Exits with
- non-zero status if problems are found. Not compatible with
- --exit-code.
+ Warn if changes introduce whitespace errors. What are
+ considered whitespace errors is controlled by `core.whitespace`
+ configuration. By default, trailing whitespaces (including
+ lines that solely consist of whitespaces) and a space character
+ that is immediately followed by a tab character inside the
+ initial indent of the line are considered whitespace errors.
+ Exits with non-zero status if problems are found. Not compatible
+ with --exit-code.
endif::git-format-patch[]
--full-index::

0 comments on commit def9803

Please sign in to comment.