From: Junio C Hamano <gitster@pobox.com>
To: Ori Avtalion <ori@avtalion.name>
Cc: git@vger.kernel.org
Subject: Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion
Date: Mon, 28 Mar 2016 16:01:25 -0700 [thread overview]
Message-ID: <xmqqd1qe1a2i.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CALgdb5JuoYpHAPxTY2cHdbkcPUjKtsWQ_DY5rBrw-YKCwj2yvw@mail.gmail.com> (Ori Avtalion's message of "Tue, 29 Mar 2016 01:44:06 +0300")
Ori Avtalion <ori@avtalion.name> writes:
> A bug report and a suggestion:
>
> `git diff --check` has been warning about conflict markers since 2008:
> https://marc.info/?l=git&m=122398500726634&w=2
>
> This is an undocumented feature. The current documentation for the
> flag only mentions "whitespace errors".
Thanks for digging (even though I do not think the message you
quoted has much to do with this).
04954043 (diff --check: detect leftover conflict markers,
2008-06-26) was the change that added this check to the "check
whitespace breakage" codepath, which forgot to update the
documentation.
And when 4f830390 (Documentation: git diff --check respects
core.whitespace, 2011-06-22) rewrote the paragraph, it again didn't
remember to update it to match the reality.
Care to try a patch?
next prev parent reply other threads:[~2016-03-28 23: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 [this message]
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 ` [PATCH] Documentation: git diff --check detects conflict markers Ori Avtalion
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=xmqqd1qe1a2i.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ori@avtalion.name \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.