From: Martin Fick <mfick@codeaurora.org>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Carl Baldwin <carl@ecbaldwin.net>, Theodore Ts'o <tytso@mit.edu>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Bring together merge and rebase
Date: Thu, 04 Jan 2018 17:31:39 -0700 [thread overview]
Message-ID: <5636043.i54Fe5jZ1b@mfick-lnx> (raw)
In-Reply-To: <2180514.YZ24uruNv3@mfick-lnx>
> On Jan 4, 2018 11:19 AM, "Martin Fick"
<mfick@codeaurora.org> wrote:
> > 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:
> > > >> 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!
On Thursday, January 04, 2018 04:02:40 PM Jacob Keller
wrote:
> Any chance slides or a recording was posted anywhere? I'm
> quite interested in this topic.
Slides and video + transcript here:
https://gerrit.googlesource.com/summit/2017/+/master/sessions/new-in-2.15.md
Watch the part after the backend improvements,
-Martin
--
The Qualcomm Innovation Center, Inc. is a member of Code
Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2018-01-05 0:31 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-23 6:10 Bring together merge and rebase Carl Baldwin
2017-12-23 18:59 ` Ævar Arnfjörð Bjarmason
2017-12-23 21:01 ` Carl Baldwin
2017-12-23 22:09 ` Ævar Arnfjörð Bjarmason
2017-12-26 0:16 ` Carl Baldwin
2017-12-26 1:28 ` Jacob Keller
2017-12-26 23:30 ` Igor Djordjevic
2017-12-26 17:49 ` Ævar Arnfjörð Bjarmason
2017-12-26 19:44 ` Carl Baldwin
2017-12-26 20:19 ` Paul Smith
2017-12-26 21:07 ` Carl Baldwin
2017-12-23 22:19 ` Randall S. Becker
2017-12-25 20:05 ` Carl Baldwin
2017-12-23 23:01 ` Johannes Schindelin
2017-12-24 14:13 ` Alexei Lozovsky
2018-01-04 15:44 ` Johannes Schindelin
2017-12-25 23:43 ` Carl Baldwin
2017-12-26 0:01 ` Randall S. Becker
2018-01-04 19:49 ` Martin Fick
2017-12-23 22:30 ` Johannes Schindelin
2017-12-25 3:52 ` Theodore Ts'o
2017-12-26 1:16 ` Carl Baldwin
2017-12-26 1:47 ` Jacob Keller
2017-12-26 6:02 ` Carl Baldwin
2017-12-26 8:40 ` Jacob Keller
2018-01-04 19:19 ` Martin Fick
2018-01-05 0:31 ` Martin Fick [this message]
2018-01-05 5:09 ` Carl Baldwin
2018-01-05 5:20 ` Carl Baldwin
2017-12-26 18:04 ` Theodore Ts'o
2017-12-26 20:31 ` Carl Baldwin
2018-01-04 20:06 ` Martin Fick
2018-01-05 5:06 ` Carl Baldwin
2018-01-04 19:54 ` Martin Fick
2018-01-05 4:08 ` Carl Baldwin
2018-01-05 20:14 ` Junio C Hamano
2018-01-06 17:29 ` Carl Baldwin
2018-01-06 17:32 ` Carl Baldwin
2018-01-06 21:38 ` Theodore Ts'o
2017-12-27 4:35 ` Carl Baldwin
2017-12-27 13:35 ` Alexei Lozovsky
2017-12-28 5:23 ` Carl Baldwin
2017-12-26 4:08 ` Mike Hommey
2017-12-27 2:44 ` Carl Baldwin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5636043.i54Fe5jZ1b@mfick-lnx \
--to=mfick@codeaurora.org \
--cc=carl@ecbaldwin.net \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).