From: Ori Avtalion <ori@avtalion.name>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion
Date: Tue, 29 Mar 2016 14:19:47 +0300 [thread overview]
Message-ID: <CALgdb5+E7_CT2e9WFBd9GhiFuc_B7+bpC9tjDfR+-QiTGeoP+A@mail.gmail.com> (raw)
In-Reply-To: <xmqqd1qe1a2i.fsf@gitster.mtv.corp.google.com>
On Tue, Mar 29, 2016 at 2:01 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Ori Avtalion <ori@avtalion.name> writes:
>
> Thanks for digging (even though I do not think the message you
> quoted has much to do with this).
Oops, you are correct! I had several tabs open digging through the archives and
picked the wrong one :)
> Care to try a patch?
Yes. Will submit one soon.
If my change introduces a few words that exceed asciidoc's ~72-char line width,
should I reformat the entire paragraph? (thus making it had to identify what
changed exactly)
Any thoughts on adding similar functionality to "git add"?
next prev parent reply other threads:[~2016-03-29 11:19 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 [this message]
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=CALgdb5+E7_CT2e9WFBd9GhiFuc_B7+bpC9tjDfR+-QiTGeoP+A@mail.gmail.com \
--to=ori@avtalion.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).