From: Daniel Barkalow <barkalow@iabervon.org>
To: git@vger.kernel.org
Subject: Distributing revisions to patches in a series
Date: Thu, 6 Sep 2007 22:34:24 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0709062219320.13907@iabervon.org> (raw)
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).
-Daniel
*This .sig left intentionally blank*
next reply other threads:[~2007-09-07 2:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-07 2:34 Daniel Barkalow [this message]
2007-09-07 11:04 ` Distributing revisions to patches in a series Johannes Schindelin
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=Pine.LNX.4.64.0709062219320.13907@iabervon.org \
--to=barkalow@iabervon.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).