diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
| commit | b0fbcf0003d87c050a55434eaf74a48ad78cb2a9 (patch) | |
| tree | fd0a1728fc4b6773ab431fd5c187aa3dc67a15c1 /Documentation | |
| parent | 8fdfaf0b2f882dea825f3f9abe92af13c45432a5 (diff) | |
| parent | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (diff) | |
| download | git-b0fbcf0003d87c050a55434eaf74a48ad78cb2a9.tar.gz | |
Merge branch 'oa/doc-diff-check'
A minor documentation update.
* oa/doc-diff-check:
Documentation: git diff --check detects conflict markers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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 |