From: Junio C Hamano Date: Fri, 8 Apr 2016 21:29:13 +0000 (-0700) Subject: Merge branch 'oa/doc-diff-check' X-Git-Tag: v2.9.0-rc0~140 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/b0fbcf0003d87c050a55434eaf74a48ad78cb2a9?hp=8fdfaf0b2f882dea825f3f9abe92af13c45432a5 Merge branch 'oa/doc-diff-check' A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers --- 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