diff options
| author | Ori Avtalion <ori@avtalion.name> | 2016-03-29 21:59:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-29 13:14:50 -0700 |
| commit | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (patch) | |
| tree | f01ef44625d104c2e8d6507c5f8e5f60f2339352 | |
| parent | Git 2.6.6 (diff) | |
| download | git-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.tar.gz git-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.zip | |
Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 |