From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BE12B1F404 for ; Fri, 5 Jan 2018 00:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751295AbeAEAbn (ORCPT ); Thu, 4 Jan 2018 19:31:43 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:51546 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbeAEAbm (ORCPT ); Thu, 4 Jan 2018 19:31:42 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3FB986025C; Fri, 5 Jan 2018 00:31:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1515112302; bh=/WTmsBclD2pV+IslMqBk0Aa9bq/ILegbU02Ik3apxtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VihU6QNIIw/in2KrI+4aiJDgJONSASX1M/jeyxKOL6WmMaNXS1B6LLRtOVTX3DnZp zYEjXr+m6BR2hLYi7uuBhomv1eTbHP3QsYCRk/Av62BiQvDl7f2//nyn3pha7x2CXB fjIEkzwhImG41XFEWu/xzAfNDxajk5KEz9Z6nB7o= Received: from mfick-lnx.localnet (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mfick@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8B1EA6025C; Fri, 5 Jan 2018 00:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1515112301; bh=/WTmsBclD2pV+IslMqBk0Aa9bq/ILegbU02Ik3apxtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TIt5vwnAD1LKRz+9+5WoWhdkk8WBVugxxCHwGb2i/UQ/VO5uKFv3rvRJu337DltsG ohDvJLVGuFUIuSLCLL5NFk0y3HLWl0W2mDof/cxhYhegwlCUMrjIqxIvd0eKOpYtoW 8iwgQuopR9ALwEzvmcbIgQmnhYQS1EFha9odOskY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8B1EA6025C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=mfick@codeaurora.org From: Martin Fick To: Jacob Keller Cc: Carl Baldwin , Theodore Ts'o , Git Mailing List Subject: Re: Bring together merge and rebase Date: Thu, 04 Jan 2018 17:31:39 -0700 Message-ID: <5636043.i54Fe5jZ1b@mfick-lnx> User-Agent: KMail/4.13.3 (Linux/3.13.0-125-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <2180514.YZ24uruNv3@mfick-lnx> References: <2180514.YZ24uruNv3@mfick-lnx> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org > On Jan 4, 2018 11:19 AM, "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! 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