From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Jul 2026 23:21:01 +0000 (-0700)
Subject: Merge branch 'hs/rebase-continue-edit' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9308c0915ba80605952d2a02482e4c2a80ec5834;p=thirdparty%2Fgit.git

Merge branch 'hs/rebase-continue-edit' into seen

Support for skipping the editor when continuing a rebase after
conflict resolution has been added with the '--no-edit' option, and
forcing it with '--edit'.  A new configuration variable
'rebase.noEdit' can be used to set the default behavior.

* hs/rebase-continue-edit:
  rebase: add --[no-]edit to --continue
---

9308c0915ba80605952d2a02482e4c2a80ec5834