9front - general discussion about 9front
 help / color / mirror / Atom feed
From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
To: 9front@9front.org
Subject: [9front] Git interactive rebase
Date: Mon, 03 Jan 2022 16:17:04 +0100	[thread overview]
Message-ID: <87wnjgyhlb.fsf@turtle-trading.net> (raw)

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

             reply	other threads:[~2022-01-03 16:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-03 15:17 Benjamin Riefenstahl [this message]
2022-01-04 16:31 ` ori
2022-01-04 18:24   ` Benjamin Riefenstahl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wnjgyhlb.fsf@turtle-trading.net \
    --to=b.riefenstahl@turtle-trading.net \
    --cc=9front@9front.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).