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.2 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 0FF121F404 for ; Fri, 20 Apr 2018 22:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752844AbeDTWTS (ORCPT ); Fri, 20 Apr 2018 18:19:18 -0400 Received: from mout.gmx.net ([212.227.17.21]:39557 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbeDTWTQ (ORCPT ); Fri, 20 Apr 2018 18:19:16 -0400 Received: from [192.168.0.129] ([37.201.195.116]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LviG8-1eMD340cI8-017S2M; Sat, 21 Apr 2018 00:19:10 +0200 Date: Sat, 21 Apr 2018 00:18:53 +0200 (DST) From: Johannes Schindelin X-X-Sender: virtualbox@MININT-6BKU6QN.europe.corp.microsoft.com To: Junio C Hamano cc: git@vger.kernel.org Subject: js/rebase-recreate-merges, was Re: What's cooking in git.git (Apr 2018, #02; Tue, 17) In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:QKw0eQCHn0h928nWO7AOkXjiCzd4zVNObKzO3/u63XOXgBV2m+/ 125GolqOD9a6njzqKoOt+xkNYBAOzKVw3P99dsBUl3ZVqTPmi4uZ1WM8e7asQrehRw+D7fu wefgwqJsq8NNC/mIxqd2jXM/nkwNYvML+W4kicNIPhe/el9ihkVxFnV+hN2qpEfPJ+kwHD7 n6gzP0Ok35L86fuZxtMNQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:1fUCeFCugbY=:KDb/IJnEEW6IIt0dqrCXvL mnPZGl+k7gRouFVYv32DlUYt2y0b9LTuDaicyIvqxQYBZbZPUG/Azvx3mKvEPExEOnkealN7x zfdlKtFin42PZsdo28PxrQRVcyWie1+nllH6LqT4KOz974iuQiijeb0F8zS4cDDulWtVIc6If 7j+bFdLz3vDz8mBPVOUEPhlUbiOHRg9+9FstOtzLNaFlb7A81zUZghjl7LN24KVoiaCudb4s0 jZOJBxQsgUVo081aWhyCOUouyIzF7n/73Bw9n11HE4RUGzyl/LORlOdMavv08zmYIKkKKtqcr 0iXyeMwd1p/AR9gv6RR4AYVGmJzUWLcYHAqtZ1ff6HKoT9xbG9mw6AjDg4iDmFku8jo2jwHva RLcR7D560na81gfP7gVULmKIldEBbqe47WYeHI06UWx0uQX6hYq2it3G+u0wZAOIY4Yop/XlN l3bH8zKHjyvMJz91BkBXkH5dal8mVpEoljxr8WljwoaG/BnLdmjhV1iy9yBv2VzLmD2ogXbuK ho05L1eF19/2lVx3nEMZdsC96dQCXiN3kDYpqs56kFOHY6/o6VtQQDoNZFnZGYtJoMYWCv5+N DO4g/jV55mQbsN6lIUTZGOetJOOqY6Q6wetFZSG88ZxS23hTQX8dVsDlZY2ynMOSqT3oWGbPt vdlR8QGh0l019MIX85ka1sfNzrpY7hBTNSfMDNYn0bg6U86KnyYc1QSVyoUF0w2doAbBb7mfv hlqlghytBtPZj9V+ofBNNNY433o9gIcsB9KuX9WeY6j9x7TgnsUJODNSoI26KS4YixSPZ5R+9 mKsU7sGrk8MhabYkZULydVCLh4/kUb3oc16lIYNWuG9+tdt01w= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Junio, On Tue, 17 Apr 2018, Junio C Hamano wrote: > * js/rebase-recreate-merge (2018-04-11) 15 commits > - rebase -i --rebase-merges: add a section to the man page > - rebase -i: introduce --rebase-merges=[no-]rebase-cousins > - pull: accept --rebase=merges to recreate the branch topology > - rebase --rebase-merges: avoid "empty merges" > - sequencer: handle post-rewrite for merge commands > - sequencer: make refs generated by the `label` command worktree-local > - rebase --rebase-merges: add test for --keep-empty > - rebase: introduce the --rebase-merges option > - rebase-helper --make-script: introduce a flag to rebase merges > - sequencer: fast-forward `merge` commands, if possible > - sequencer: introduce the `merge` command > - sequencer: introduce new commands to reset the revision > - git-rebase--interactive: clarify arguments > - sequencer: make rearrange_squash() a bit more obvious > - sequencer: avoid using errno clobbered by rollback_lock_file() > > "git rebase" learned "--rebase-merges" to transplant the whole > topology of commit graph elsewhere. > > This looked more or less ready for 'next'. Please stop me if there > are remaining issues I forgot about. Phillip pointed out some ugliness in the way I reschedule commands after they failed fatally, and I will fix that, I will also fix the erroneous commit message starting with "# This is a combination of ...", and then I wanted to go over the added documentation one last time (with a fresh set of eyes, after looking at so much other code). So: please do not yet merge this to `next`. I think I need one more iteration. Ciao, Dscho