Re: Distributing revisions to patches in a series
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 7, 2007, 11:04 UTC
- Message-ID
- <Pine.LNX.4.64.0709071202570.28586@racer.site>
- In-Reply-To
- <Pine.LNX.4.64.0709062219320.13907@iabervon.org>
Hi,
On Thu, 6 Sep 2007, Daniel Barkalow wrote:
Show 16 quoted lines
> I was wondering if anybody's got a good process for the following > situation: I've just rebased a series onto the new origin/next. In the > afterwards, I determined that some of the intermediate merges weren't > right (the patch to split bundle-handling out of builtin-bundle didn't > pick up fixes to builtin-bundle). I also found and fixed a warning added > by my series. I want to take these changes, split them into individual > hunks, and apply each hunk to the appropriate commit from the series > before that commit, generating a new series. > > I know how to do it by figuring out where the hunk should go myself and > branching, fixing, and rebasing, but I was wondering if there was a > magic script to just do it. It seems like it should be an automatable > operation (take the last commit as a set of hunks, and walk back up the > history, leaving each one at the oldest commit to which it applies > cleanly; when all of the hunks are allocated, generate a new history by > amending commits).
Sounds like you want to read the new section "splitting commits" in git-rebase.txt ;-)
Hth, Dscho