Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ori Avtalion committed
Mar 29, 2016 at 21:59 UTC
30211fb68d64c2b3852da5b5f846d8d52d70c9c1
1 file changed
+2
-2
Documentation/diff-options.txt
+2
-2
@@ -286,8 +286,8 @@ endif::git-format-patch[]
286
287
ifndef::git-format-patch[]
288
--check::
289
- Warn if changes introduce whitespace errors. What are
290
- considered whitespace errors is controlled by `core.whitespace`
289
+ Warn if changes introduce conflict markers or whitespace errors.
290
+ What are considered whitespace errors is controlled by `core.whitespace`
291
configuration. By default, trailing whitespaces (including
292
lines that solely consist of whitespaces) and a space character
293
that is immediately followed by a tab character inside the