Re: Bring together merge and rebase

From: Martin Fick <mfick@codeaurora.org>
Date: Jan 4, 2018, 19:19 UTC
Message-ID: <2180514.YZ24uruNv3@mfick-lnx>
In-Reply-To: <CA+P7+xpvuCjdnjyQxQg3B5iMwbnx-CerQMAP+bDQHR_-ALJOkQ@mail.gmail.com>

On Tuesday, December 26, 2017 12:40:26 AM Jacob Keller wrote:

> On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin

<carl@ecbaldwin.net> wrote:

> >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin

<carl@ecbaldwin.net> wrote:

Show 9 quoted lines

> >> 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!

-Martin

-- 
The Qualcomm Innovation Center, Inc. is a member of Code 
Aurora Forum, hosted by The Linux Foundation