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: Tue, 29 Mar 2016 11:23:42 -0700 [thread overview]
Message-ID: <xmqqvb45xhw1.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CALgdb5+E7_CT2e9WFBd9GhiFuc_B7+bpC9tjDfR+-QiTGeoP+A@mail.gmail.com> (Ori Avtalion's message of "Tue, 29 Mar 2016 14:19:47 +0300")
Ori Avtalion <ori@avtalion.name> writes:
> 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)
You should try to minimize the damage, but shouldn't go overboard ;-)
> Any thoughts on adding similar functionality to "git add"?
I am not sure what "similar functionality" you are imagining.
"git add" does not show any changes, it just does what it was told
to do. If the user is unsure, s/he should make it the habit to
check what s/he is doing with "git diff".
next prev parent reply other threads:[~2016-03-29 18:23 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 [this message]
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=xmqqvb45xhw1.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.