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

2018-11-02 Thread Stefan Beller
On Thu, Nov 1, 2018 at 6:19 PM james harvey wrote: > > This sounds like you are asking for two things: > > (1) make color-moved work with words (somehow) > > (2) allow the user to fine tune the heuristics for a block, > > such that default=zebra would still work. > > I was asking for #1. I

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

2018-11-01 Thread james harvey
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 need > to figure out what that means. In its current

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

2018-10-31 Thread Stefan Beller
On Wed, Oct 31, 2018 at 12:07 AM james harvey wrote: > I think these options can co-exist. I could be wrong, but I'm betting > the code for "--color-moved" was only written with the typical full > line(s) diff in mind, and wasn't written with "--word-diff" in mind. I think it was brought up,

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

2018-10-31 Thread Stefan Beller
On Tue, Oct 30, 2018 at 7:06 PM james harvey wrote: > > 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. The order of arguments doesn't matter here, as these just set

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

2018-10-31 Thread james harvey
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" > > isn't allowed to do anything. > > > > I think "--color-moved"

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

2018-10-30 Thread Junio C Hamano
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" > isn't allowed to do anything. > > I think "--color-moved" should have precedence over "--word-diff". I > cannot think of a

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

2018-10-30 Thread james harvey
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