From: Ori Avtalion Date: Tue, 29 Mar 2016 18:27:47 GMT Subject: Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion Message-ID: In-Reply-To: On Tue, Mar 29, 2016 at 9:23 PM, Junio C Hamano wrote: > Ori Avtalion writes: > 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". I was thinking of an off-by-default setting where git-add outright refuses to stage changes that do not pass "diff --check". I understand if that's a big deviation from the spirit of the tool, and perhaps not a good idea.