Re: sending changesets from the middle of a git tree
- From
- Ryan Anderson <ryan@michonline.com>
- Date
- Aug 15, 2005, 06:35 UTC
- Message-ID
- <20050815063502.GD7001@mythryan2.michonline.com>
- In-Reply-To
- <20050814040233.GC6844@mythryan2.michonline.com>
On Sun, Aug 14, 2005 at 12:02:33AM -0400, Ryan Anderson wrote:
Show 9 quoted lines
> On Sat, Aug 13, 2005 at 10:35:50PM -0500, Steve French wrote: > > > 2) There is no way to update the comment field of a changeset after it > > goes in (e.g. to add a bugzilla bug number for a bug that was opened > > just after the fix went in). > > No, a commit is immutable. You can use "git format-patch" to rebase things if > you need. I prefer to use "git format-patch --mbox", edit what I need > to, then use git-applymbox to rebase it all against a clean tree.
Note (and I should have said this at first), doing it this way gives you the opportunity to combine a few changes if you want.
Use git-format-patch-script to pull out what you want, delete the diff from the bottom of the file, manually diff what you need using git-diff-script, and stick that back at the end of the file git-format-patch-script created.
This seems to be the easiest way to clean up your change history.
-- Ryan Anderson sometimes Pug Majere