From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D92F01F619 for ; Fri, 20 Mar 2020 23:35:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727590AbgCTXfi (ORCPT ); Fri, 20 Mar 2020 19:35:38 -0400 Received: from mx.sdf.org ([205.166.94.20]:61523 "EHLO mx.sdf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726738AbgCTXfi (ORCPT ); Fri, 20 Mar 2020 19:35:38 -0400 Received: from sdf.org (IDENT:lkml@sdf.lonestar.org [205.166.94.16]) by mx.sdf.org (8.15.2/8.14.5) with ESMTPS id 02KNZSi2014152 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO); Fri, 20 Mar 2020 23:35:29 GMT Received: (from lkml@localhost) by sdf.org (8.15.2/8.12.8/Submit) id 02KNZSvF025632; Fri, 20 Mar 2020 23:35:28 GMT Date: Fri, 20 Mar 2020 23:35:28 +0000 From: George Spelvin To: Junio C Hamano Cc: git@vger.kernel.org, Johannes Schindelin , lkml@sdf.org Subject: Re: Feature request: rebase -i inside of rebase -i Message-ID: <20200320233528.GB19579@SDF.ORG> References: <20200320223015.GA19579@SDF.ORG> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Mar 20, 2020 at 03:51:20PM -0700, Junio C Hamano wrote: > I thought that "git rebase -i" allows the todo file (i.e. list of > steps still to be performed) to be edited before continuing; would > your use case be supported by using that? Mostly, if I do it very carefully, which is why I thought it would be easy to add. I think I could manually add the commits to the start of the todo file, reset --hard to the old state, and rebase --continue. But cutting and pasting commit IDs from git log into the todo file, and putting fixup commits in the right place is annoyingly fiddly. That's exactly the sort of thing computers are good at.