Git development
 help / color / mirror / Atom feed
From: Hugo Sales <hugo@hsal.es>
To: git@vger.kernel.org
Cc: Hugo Sales <hugo@hsal.es>
Subject: [PATCH 0/1] rebase: add --[no-]edit to --continue
Date: Tue, 21 Jul 2026 15:04:41 +0100	[thread overview]
Message-ID: <20260721140443.1809379-1-hugo@hsal.es> (raw)

When a rebase stops for conflicts and the user runs `git rebase --continue`, the
merge backend opens $EDITOR so the commit message can be revised. That is often
useful, but not always: sometimes the user only wants to keep the message that
is already there.

This series adds:

- `git rebase --continue --no-edit` to commit without opening an editor
- `rebase.noEdit` to make that the default on continue
- `git rebase --continue --edit` to override `rebase.noEdit`

The command-line flags apply only to the current `--continue` invocation, not to
later picks in the same rebase.

Tests are added in t3436. I also ran all tests locally.

Hugo Sales (1):
  rebase: add --[no-]edit to --continue

 Documentation/config/rebase.adoc |  6 ++++
 Documentation/git-rebase.adoc    | 17 +++++++++--
 builtin/rebase.c                 | 29 ++++++++++++++++--
 sequencer.c                      | 29 +++++++++++++++++-
 t/t3436-rebase-more-options.sh   | 52 ++++++++++++++++++++++++++++++++
 5 files changed, 126 insertions(+), 7 deletions(-)

-- 
2.54.0

             reply	other threads:[~2026-07-21 14:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-21 14:04 Hugo Sales [this message]
2026-07-21 14:04 ` [PATCH 1/1] rebase: add --[no-]edit to --continue Hugo Sales
2026-07-21 18:04 ` [PATCH 0/1] " Junio C Hamano
2026-07-22 13:39   ` Phillip Wood
2026-07-22 15:36     ` Junio C Hamano

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=20260721140443.1809379-1-hugo@hsal.es \
    --to=hugo@hsal.es \
    --cc=git@vger.kernel.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