From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 10233 invoked from network); 4 Jan 2022 17:07:07 -0000 Received: from 4ess.inri.net (216.126.196.42) by inbox.vuxu.org with ESMTPUTF8; 4 Jan 2022 17:07:07 -0000 Received: from mimir.eigenstate.org ([206.124.132.107]) by 4ess; Tue Jan 4 11:59:16 -0500 2022 Received: from abbatoir.myfiosgateway.com (pool-74-108-56-225.nycmny.fios.verizon.net [74.108.56.225]) by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id c0cef8a2 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO) for <9front@9front.org>; Tue, 4 Jan 2022 08:32:00 -0800 (PST) Message-ID: <018A3061274740797BDD9D08F3DA27E0@eigenstate.org> To: 9front@9front.org Date: Tue, 04 Jan 2022 11:31:59 -0500 From: ori@eigenstate.org In-Reply-To: <87wnjgyhlb.fsf@turtle-trading.net> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: transactional progressive HTTP over JSON proxy persistence locator Subject: Re: [9front] Git interactive rebase Reply-To: 9front@9front.org Precedence: bulk Quoth Benjamin Riefenstahl : > Hi all, > > I would like to fix git commit messages and structure of my local > branch. In particular I want to squash the last two commits. > > * So I try "git/rebase -i hash". > > * The window text turns blue (this is called hold-mode, I believe) and I > edit the todo-list to have the last commit "squash". > > * I go back to the last line and press ESC and than Control-D. > > * I get returned to the prompt. > > * When I check the history, the last two commits are gone. > > What I expected was that after editing the todo-list I get thrown into > the hold-mode again where I can edit the commit message. > > What am I doing wrong? > > TIA, benny > hold mode is slightly confusing -- only the text you enter gets sent, the text that gets printed is there as a prompt. We should think about how to improve this.