mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-29 04:54:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'oa/doc-diff-check' into maint

Browse Source 
A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers
This commit is contained in:
Junio C Hamano 2016-04-14 18:37:14 -07:00
commit 2bbaad82bb
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[]
--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