From 4f8303905eafaa04fd08a20a08a81436aea2d4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christof=20Kr=C3=BCger?= Date: Wed, 22 Jun 2011 17:33:02 +0200 Subject: [PATCH] Documentation: git diff --check respects core.whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix documentation on "git diff --check" by adopting the description from "git apply --whitespace". Signed-off-by: Christof Krüger Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 80fd817c28..96e0a581a1 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -194,10 +194,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:: -- GitLab