On Tue, Oct 4, 2016 at 11:15 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Duy Nguyen <pclouds@xxxxxxxxx> writes: > >> We don't use it internally _yet_. I need to go through all the >> external diff code and see --shift-ita should be there. The end goal >> is still changing the default behavior and getting rid of --shift-ita, > > I do not agree with that endgame, and quite honestly I do not want > to waste time reviewing such a series. I do not believe current "diff" behavior wrt. i-t-a entries is right either. There's no point in pursuing this series then. Feel free to revert 3f6d56d (commit: ignore intent-to-add entries instead of refusing - 2012-02-07) and bring back the old i-t-a behavior. All the problems would go away. -- Duy