git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ori Avtalion <ori@avtalion.name>
To: git@vger.kernel.org
Cc: Ori Avtalion <ori@avtalion.name>
Subject: [PATCH] Documentation: git diff --check detects conflict markers
Date: Tue, 29 Mar 2016 21:59:45 +0300	[thread overview]
Message-ID: <1459277985-5776-1-git-send-email-ori@avtalion.name> (raw)
In-Reply-To: <xmqqd1qe1a2i.fsf@gitster.mtv.corp.google.com>

Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
 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 306b7e3..32f48ed 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.5.0

      parent reply	other threads:[~2016-03-29 19:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-28 22:44 Warning about conflict markers - undocumented 'diff --check' feature & suggestion Ori Avtalion
2016-03-28 23:01 ` Junio C Hamano
2016-03-29 11:19   ` Ori Avtalion
2016-03-29 18:23     ` Junio C Hamano
2016-03-29 18:27       ` Ori Avtalion
2016-03-29 18:59   ` Ori Avtalion [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459277985-5776-1-git-send-email-ori@avtalion.name \
    --to=ori@avtalion.name \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).