From: Ori Avtalion Date: Tue, 29 Mar 2016 18:59:45 +0000 (+0300) Subject: Documentation: git diff --check detects conflict markers X-Git-Tag: v2.8.2~28^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/30211fb68d64c2b3852da5b5f846d8d52d70c9c1?hp=--cc Documentation: git diff --check detects conflict markers Signed-off-by: Ori Avtalion Signed-off-by: Junio C Hamano --- 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 306b7e3604..32f48ed647 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