undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: git diff --check detects conflict markers

Browse Source 
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ori Avtalion 2016-03-29 21:59:45 +03:00 committed by Junio C Hamano
parent e46579643d
commit 30211fb68d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/diff-options.txt
View File

@ -286,8 +286,8 @@ endif::git-format-patch[]
ifndef::git-format-patch[] ifndef::git-format-patch[]
--check:: --check::
Warn if changes introduce whitespace errors. What are Warn if changes introduce conflict markers or whitespace errors.
considered whitespace errors is controlled by `core.whitespace` What are considered whitespace errors is controlled by `core.whitespace`
configuration. By default, trailing whitespaces (including configuration. By default, trailing whitespaces (including
lines that solely consist of whitespaces) and a space character lines that solely consist of whitespaces) and a space character
that is immediately followed by a tab character inside the that is immediately followed by a tab character inside the