From: Carl Baldwin Date: Fri, 05 Jan 2018 05:09:20 GMT Subject: Re: Bring together merge and rebase Message-ID: <20180105050919.GA14525@Carl-MBP.ecbaldwin.net> In-Reply-To: <2180514.YZ24uruNv3@mfick-lnx> On Thu, Jan 04, 2018 at 12:19:34PM -0700, Martin Fick wrote: > On Tuesday, December 26, 2017 12:40:26 AM Jacob Keller > wrote: > > On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin > wrote: > > >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin > wrote: > > >> A bit of a tangent here, but a thought I didn't wanna > > >> lose: In the general case where a patch was rebased > > >> and the original parent pointer was changed, it is > > >> actually quite hard to show a diff of what changed > > >> between versions. > > > > My biggest gripes are that the gerrit web interface > > doesn't itself do something like this (and jgit does not > > appear to be able to generate combined diffs at all!) > > I believe it now does, a presentation was given at the > Gerrit User summit in London describing this work. It would > indeed be great if git could do this also! This would be very cool. I've wanted to tackle this for a long time. I think I even filed an issue with gerrit about this years ago. Carl