Request: git add --interactive: split hunk: When can't split further, split on empty lines

When adding interactively, 's' can be used to split the current hunk. Once it gets down to where 's' reports "Sorry, cannot split this hunk", it could be useful if it would then start splitting based on empty lines, probably leaving empty lines at the top of the split hunks. It certainly wouldn't

Re: Using --word-diff breaks --color-moved

On Wed, Oct 31, 2018 at 1:42 PM Stefan Beller wrote: > > On Tue, Oct 30, 2018 at 7:06 PM james harvey wrote: > > I think "--color-moved" should have precedence over "--word-diff". > > I agree for precedence as in "work well together". Now we'd

Re: Using --word-diff breaks --color-moved

On Wed, Oct 31, 2018 at 12:27 AM Junio C Hamano wrote: > > james harvey writes: > > > If you use both "--word-diff" and "--color-moved", regardless of the > > order of arguments, "--word-diff" takes precedence and "--color-moved" >

Using --word-diff breaks --color-moved

If you use both "--word-diff" and "--color-moved", regardless of the order of arguments, "--word-diff" takes precedence and "--color-moved" isn't allowed to do anything. I think "--color-moved" should have precedence over "--word-diff". I cannot think of a scenario where a user would supply both