From 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 Mon Sep 17 00:00:00 2001 From: Ori Avtalion <ori@avtalion.name> Date: Tue, 29 Mar 2016 21:59:45 +0300 Subject: [PATCH] Documentation: git diff --check detects conflict markers Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/diff-options.txt | 4 ++-- 1 file 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 -- 2.40.0