1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00

Merge branch 'maint'

* maint:
  Documentation: git diff --check respects core.whitespace
This commit is contained in:
Junio C Hamano 2011-06-22 14:01:18 -07:00
commit def98035d0

View file

@ -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::