Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-14 Thread Stefan Beller
On Wed, Jun 14, 2017 at 2:54 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> The color experts agreed that (3) might be the best solution >> as this gives most flexibility: >> >> "I would be happy as I can configure the bounds highlighting >>

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-14 Thread Junio C Hamano
Stefan Beller writes: > The color experts agreed that (3) might be the best solution > as this gives most flexibility: > > "I would be happy as I can configure the bounds highlighting > to not exist, it would degenerate to a pure Zebra, which is > very simple to

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-13 Thread Stefan Beller
On Wed, Jun 7, 2017 at 10:41 PM, Jacob Keller wrote: > On Mon, Jun 5, 2017 at 11:52 PM, Jacob Keller wrote: >> >> I will try to find some time tomorrow to go over it in detail. >>

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-07 Thread Jacob Keller
On Mon, Jun 5, 2017 at 11:52 PM, Jacob Keller wrote: > > I will try to find some time tomorrow to go over it in detail. > > Thanks, > Jake For the record, I got pulled into a project at work, so I won't have spare time to look into this for the near future. :( Probably

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-07 Thread Stefan Beller
On Wed, Jun 7, 2017 at 2:58 PM, Ævar Arnfjörð Bjarmason wrote: > On Wed, Jun 7, 2017 at 8:28 PM, Stefan Beller wrote: >> On Tue, Jun 6, 2017 at 3:05 PM, Jacob Keller wrote: >>> On Tue, Jun 6, 2017 at 2:50 AM, Michael Haggerty

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-07 Thread Ævar Arnfjörð Bjarmason
On Wed, Jun 7, 2017 at 8:28 PM, Stefan Beller wrote: > On Tue, Jun 6, 2017 at 3:05 PM, Jacob Keller wrote: >> On Tue, Jun 6, 2017 at 2:50 AM, Michael Haggerty >> wrote: >>> On Mon, Jun 5, 2017 at 8:23 PM, Stefan Beller

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-07 Thread Stefan Beller
On Tue, Jun 6, 2017 at 3:05 PM, Jacob Keller wrote: > On Tue, Jun 6, 2017 at 2:50 AM, Michael Haggerty wrote: >> On Mon, Jun 5, 2017 at 8:23 PM, Stefan Beller wrote: >>> >>> > [...] >>> > "git diff" has been taught to optionally

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-06 Thread Jacob Keller
On Tue, Jun 6, 2017 at 2:50 AM, Michael Haggerty wrote: > On Mon, Jun 5, 2017 at 8:23 PM, Stefan Beller wrote: >> >> > [...] >> > "git diff" has been taught to optionally paint new lines that are >> > the same as deleted lines elsewhere differently

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-06 Thread Michael Haggerty
On Mon, Jun 5, 2017 at 8:23 PM, Stefan Beller wrote: > > > [...] > > "git diff" has been taught to optionally paint new lines that are > > the same as deleted lines elsewhere differently from genuinely new > > lines. > > > > Are we happy with these changes? I've been

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-06 Thread Jacob Keller
On Mon, Jun 5, 2017 at 6:10 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> "git diff" has been taught to optionally paint new lines that are >>> the same as deleted lines elsewhere differently from genuinely new >>> lines. >>> >>> Are we happy

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-06 Thread Jacob Keller
On Mon, Jun 5, 2017 at 11:23 AM, Stefan Beller wrote: >> * sb/diff-color-move (2017-06-01) 17 commits >> - diff.c: color moved lines differently >> - diff: buffer all output if asked to >> - diff.c: emit_line includes whitespace highlighting >> - diff.c: convert

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-05 Thread Junio C Hamano
Stefan Beller writes: >> "git diff" has been taught to optionally paint new lines that are >> the same as deleted lines elsewhere differently from genuinely new >> lines. >> >> Are we happy with these changes? > > I advertised this series e.g. for reviewing Brandons >

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-05 Thread Stefan Beller
> * sb/diff-color-move (2017-06-01) 17 commits > - diff.c: color moved lines differently > - diff: buffer all output if asked to > - diff.c: emit_line includes whitespace highlighting > - diff.c: convert diff_summary to use emit_line_* > - diff.c: convert diff_flush to use emit_line_* > -

What's cooking in git.git (Jun 2017, #03; Mon, 5)

2017-06-04 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. With many fixes accumulated since