Re: interactive rebase should better highlight the not-applying commit

2016-10-13 Thread Johannes Schindelin
Hi Joshua, On Wed, 12 Oct 2016, Joshua N Pritikin wrote: > On Wed, Oct 12, 2016 at 06:24:37PM +0200, Johannes Schindelin wrote: > > > But maybe I read it all wrong and you do want to make this happen > > yourself, and you simply want a little advice how to go about it? > > Ugh, if you insist.

Re: interactive rebase should better highlight the not-applying commit

2016-10-12 Thread Joshua N Pritikin
On Wed, Oct 12, 2016 at 06:24:37PM +0200, Johannes Schindelin wrote: > No, a false belief in your own shortcomings, as you thought it would be > easier to address your wishes for somebody else than you. Ah, shucks, I guess I could jump in. > But maybe I read it all wrong and you do want to make

Re: interactive rebase should better highlight the not-applying commit

2016-10-12 Thread Johannes Schindelin
Hi Joshua, On Wed, 12 Oct 2016, Joshua N Pritikin wrote: > On Tue, Oct 11, 2016 at 01:55:22PM -0700, Stefan Beller wrote: > > On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin > > wrote: > > > I assume somebody familiar with GIT's code base could make this > > > change

Re: interactive rebase should better highlight the not-applying commit

2016-10-12 Thread Johannes Schindelin
Hi Stefan, On Tue, 11 Oct 2016, Stefan Beller wrote: > On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin > wrote: > > I assume somebody familiar with GIT's code base could make this change > > in about 10 minutes. > > Can you elaborate how you come to that estimate?

Re: interactive rebase should better highlight the not-applying commit

2016-10-12 Thread Joshua N Pritikin
On Tue, Oct 11, 2016 at 01:55:22PM -0700, Stefan Beller wrote: > On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin > wrote: > > I assume somebody familiar with GIT's code base could make this change > > in about 10 minutes. > > Can you elaborate how you come to that

Re: interactive rebase should better highlight the not-applying commit

2016-10-11 Thread Stefan Beller
On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin wrote: > As of GIT 2.8.1, if you do an interactive rebase and get some conflict > in the stack of patches then the commit with the conflict is buried in > 4-5 lines of output. It is visually difficult to immediately pick out

Re: interactive rebase should better highlight the not-applying commit

2016-10-11 Thread Stefan Beller
On Tue, Oct 11, 2016 at 12:07 PM, Joshua N Pritikin wrote: > I assume somebody familiar with GIT's code base could make this change > in about 10 minutes. Can you elaborate how you come to that estimate?

interactive rebase should better highlight the not-applying commit

2016-10-11 Thread Joshua N Pritikin
As of GIT 2.8.1, if you do an interactive rebase and get some conflict in the stack of patches then the commit with the conflict is buried in 4-5 lines of output. It is visually difficult to immediately pick out which commit did not apply cleanly. I suggest highlighting the 1 line commit