From: George Spelvin <lkml@SDF.ORG>
To: git@vger.kernel.org
Cc: lkml@sdf.org
Subject: Feature request: rebase -i inside of rebase -i
Date: Fri, 20 Mar 2020 22:30:15 +0000 [thread overview]
Message-ID: <20200320223015.GA19579@SDF.ORG> (raw)
I'm cleaning up a patch series for submission, and came across a fixup in
patch #4/20 that belongs in #2/20.
Unfortunately, I can't go back two patches to apply the fix until I get to
the end of the current rebase, then go back down to clean it up. :-(
Thinking about it, I realized that a rebase in a rebase is a perfectly
well defined operation. *If* you don't bother setting a new abort point
(it's not a fully nested transaction), *and* require that the tree be
clean (no stashing allowed; create a WIP commit instead), it's just a
matter of putting some commits back on the front of the todo-list and
checking out the old version.
This would make rebase work more like quilt.
I'm not sure how difficult this would be, but it might be worth looking
into. (Possibly gated by an extra option like --nested.)
(A second thing that would be nice would be a documented way to break out
of a reword and change the commit. A few times I've been improving
the documentation of a patch and realized that I should change the
function name.)
next reply other threads:[~2020-03-20 22:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 22:30 George Spelvin [this message]
2020-03-20 22:51 ` Feature request: rebase -i inside of rebase -i Junio C Hamano
2020-03-20 23:35 ` George Spelvin
2020-03-21 10:51 ` Johannes Schindelin
2020-03-21 17:56 ` George Spelvin
2020-03-25 19:26 ` Johannes Schindelin
2020-03-26 0:18 ` George Spelvin
2020-03-28 14:25 ` Johannes Schindelin
2020-03-28 16:30 ` George Spelvin
2020-03-31 0:00 ` George Spelvin
2020-03-31 10:57 ` Philip Oakley
2020-03-31 13:36 ` Phillip Wood
2020-04-01 16:43 ` Philip Oakley
2020-04-07 15:54 ` Phillip Wood
2020-04-04 12:17 ` Johannes Schindelin
2020-04-04 12:39 ` Johannes Schindelin
2020-04-04 17:41 ` George Spelvin
2020-04-06 10:40 ` Sebastien Bruckert
2020-04-06 15:24 ` George Spelvin
2020-04-07 9:16 ` Sebastien Bruckert
2020-04-07 19:03 ` George Spelvin
2020-03-30 14:01 ` Philip Oakley
2020-03-30 18:18 ` George Spelvin
2020-03-30 21:53 ` Philip Oakley
2020-03-21 8:47 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200320223015.GA19579@SDF.ORG \
--to=lkml@sdf.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).