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=-2.6 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 517D31F404 for ; Wed, 31 Jan 2018 13:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbeAaN3v (ORCPT ); Wed, 31 Jan 2018 08:29:51 -0500 Received: from mout.gmx.net ([212.227.17.21]:56442 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbeAaN3u (ORCPT ); Wed, 31 Jan 2018 08:29:50 -0500 Received: from MININT-KR8J64V.europe.corp.microsoft.com ([37.201.195.59]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Ld0E0-1f7AjY0Fgu-00iDl9; Wed, 31 Jan 2018 14:29:44 +0100 Date: Wed, 31 Jan 2018 14:29:42 +0100 (STD) From: Johannes Schindelin X-X-Sender: virtualbox@MININT-6BKU6QN.europe.corp.microsoft.com To: Junio C Hamano cc: git@vger.kernel.org, Jacob Keller , Stefan Beller , Philip Oakley , Eric Sunshine , Phillip Wood Subject: Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits 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:K0:HfUky/Uowebpu7UjN/tmSPx4NXnjaoPTnzkTRT6/nY7AEAHm6GK Ea64ebqIGO3ZPPVyUxHEK6ZmbFmibMzyPIN5sm4Fv8g0W3v1ZaQmxfmgDB938QiAaInSbjc 3be5HDHOZ+xqYZhFeO+TVw3IMOSZZfOUmb9v6gDw4MniCy0y7c6p5yN+xHcHH8Dkx3rUJKV +diYyk1teM5zNT2qZxYag== X-UI-Out-Filterresults: notjunk:1;V01:K0:uCHAjjvAX1I=:3JPAt0qO5EkgJhtJl1IPt3 q1i3cOlzkb3FhTY4B9AJxq39Y+eCZdqFIuiEqtoXTpqYsfFJRiXmTa4i0yJVQZf102nsMeO3o ove9S1CbcFScidBH98UKqzL/D7Ea3qBgUuG0r3IBIiSNc4T3cx1MLRzxtk7PD7Bj0mNsNlwSc WV1/+Qs3Rb4aJ7pbw89iGd6VUGhIuG7YiEced/USno/aaMpwLCMYqgNudfFIvwa+pEHxSRStO GdFJa4z0ah1kdtc1C9qg/TXFcF/j7m4fUbMsAnC2dIzd6PvHMHLKA8Xnu47ckar4Vq0vnCmfj cASEsRC/XGdhCRV1LHOiX1A0MqWOKxxo3Zm7NM9VKCd8wyWSMzNXvYEipdEjrICBDLN1i089e dXlS7GptycGHUJRizeCG+0QBm5HFGx8OfdUIy4FQJweb1tD+8K13PhTuTERFRNBWgs8hNAzwp Q6W3hppIal12ETIqgtoUOvvpOTdKr7gyBxU9FSTFzt8gbp6J1ytcQ359P5iuPM52ceJNYjsIu P0nF3ePbM4BqnaTuZ3Vm+0QfhhG9Uds2WD4INV/wdCr/NrmmijXxRGABliGWJcHP2uFzmLY7c j5ddqWHYD1aAPFKoclLfjI7MmPasXF4XIBGqsAIBODPzrLksFJp49+7tNFUZuxpIR37y5hmCE 5axs+CEihWji+dr9rIEzzEFKH1tfwaKtTMjZ49+t/Sd2SLOtGDOMjFeRgAQ1sKTOq3BRmLjsS b5Hv2st/4Cwe4kCmCv4XzyZCht4/DuM8JnPd+AXTsdfECsRn2Plu9gRtxFRu2R85mCKNVLR6Z nDbxX8IwHmEtZF5UurroAs2O05lFyp75dj9NLmIur0tv/13Q0655la0nvipiF7b9OQ+vz8+ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Junio, On Tue, 30 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v1: > > > > - reintroduced "sequencer: make refs generated by the `label` command > > worktree-local" (which was squashed into "sequencer: handle autosquash > > and post-rewrite for merge commands" by accident) > > Good. > > > - got rid of the universally-hated `bud` command > > Universally is a bit too strong a word, unless you want to hint that > you are specifically ignoring my input ;-). In the interest of comic effect, I exaggerated a little. > > - the no-rebase-cousins mode was made the default > > Although I lack first-hand experience with this implementation, this > design decision matches my instinct. Excellent. > May comment on individual patches separately, later. I think I may want to introduce a bigger change, still. I forgot who exactly came up with the suggestion to use `merge -C ` (I think it was Jake), and I reacted too forcefully in rejecting it. This design had been my original design in the Git garden shears, and I did not like it because it felt clunky and it also broke the style of . But the longer I think about this, the more I come to the conclusion that I was wrong, and that the -C way is the way that leaves the door open to the pretty elegant `-c ` (imitating `git commit`'s option to borrow the commit message from elsewhere but still allowing to edit it). And it also leaves open the door to just write `merge ` and have the sequencer come up with a default merge message that the user can then edit. I'll probably refrain from implementing support for -m because I do not want to implement the dequoting. Ciao, Dscho