diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
| commit | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (patch) | |
| tree | 77e2756b2438903b8a9403d7f3468f962341b99f /diff-options.txt | |
| parent | bec5da4921ecdf10f30acd425332ad4c40801c8b (diff) | |
| download | git-htmldocs-84ea1e42221ac3bab88dda1a6ee25a11802cfef9.tar.gz | |
Autogenerated HTML docs for v2.8.1-116-g7b0d4
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-options.txt b/diff-options.txt index 306b7e360..32f48ed64 100644 --- a/diff-options.txt +++ b/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 |