Re: Feature request: rebase -i inside of rebase -i

From: Johannes Sixt <j6t@kdbg.org>
Date: Mar 21, 2020, 08:47 UTC
Message-ID: <35c25a8e-f526-e5c9-5dc1-ef02315a1e97@kdbg.org>
In-Reply-To: <20200320223015.GA19579@SDF.ORG>

Am 20.03.20 um 23:30 schrieb George Spelvin:

Show 5 quoted lines

> 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. :-(

In such cases, I usually

- unstage the changes of the current commit
- stage the fixup
- `git commit --fixup @~2`
- stage what I had unstaged first
- then continue

At the end of the current rebase, a `git rebase -i --autosquash` does the final cleanup.

-- Hannes