summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorOri Avtalion <ori@avtalion.name>2016-03-29 18:59:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-29 20:14:50 (GMT)
commit30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (patch)
treef01ef44625d104c2e8d6507c5f8e5f60f2339352 /Documentation/diff-options.txt
parente46579643d56162299b1756b70d418005351b256 (diff)
downloadgit-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.zip
git-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.tar.gz
git-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.tar.bz2
Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 306b7e3..32f48ed 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -286,8 +286,8 @@ endif::git-format-patch[]
ifndef::git-format-patch[]
--check::
- Warn if changes introduce whitespace errors. What are
- considered whitespace errors is controlled by `core.whitespace`
+ Warn if changes introduce conflict markers or 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