From: Junio C Hamano Date: Fri, 15 Apr 2016 01:37:14 +0000 (-0700) Subject: Merge branch 'oa/doc-diff-check' into maint X-Git-Tag: v2.8.2~28 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c?hp=48adfa18bc5c865d72cb9a5d0f2a875d282dafb1 Merge branch 'oa/doc-diff-check' into maint 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