On Saturday, August 28, 2010 23:35:08 Reinhard Meyer wrote: > On 29.08.2010 04:26, Mike Frysinger wrote: > > On Saturday, August 28, 2010 21:59:26 Reinhard Meyer wrote: > >> On 29.08.2010 02:14, Mike Frysinger wrote: > >>> if you want to take the patch i posted and extend that by itself with > >>> the comments here, and then do the ramtron patch separately on top of > >>> that, that'd be great. > >> > >> Hehe, you like to impose extra work on poor moi.... > > > > i can do the pre-ramtron stuff if you like > > No, I meant the splitting of the patch into two. As I said, the commit is > about 10 back in my working tree, and I see no simple way of splitting the > changes... > > When I insert the table method at TOT, I can easy squash that back into > the old commit, but I still have one patch then. How do I suck the ramtron > specifics out of Makefile, spi_flash.c, spi_flash_internal.h without > un-editing them, committing, re-adding, committing?
when you're editing a commit in the middle of a rebase, you can add on any
number of commits you like on top of it. so usually the way i split commits:
git rebase -i <commit>^
<mark the commit i want to split as "edit">
<exit the rebase-todo window to start the process>
git format-patch -1
<edit the patch and keep all the hunks i want to split out>
patch -p1 -R < 0001-*
git commit -a --amend
<edit message to reflect reduced changes>
patch -p1 < 0001-*
git commit -a -c HEAD
<edit message to reflect split out changes>
git rebase --continue
maybe someone out there can suggest some shortcuts to my process ...
-mike
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
