From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2016 18:23:42 GMT
Subject: Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion
Message-ID: <xmqqvb45xhw1.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CALgdb5+E7_CT2e9WFBd9GhiFuc_B7+bpC9tjDfR+-QiTGeoP+A@mail.gmail.com>

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".