[U-Boot] [PATCH] MTD/SPI/FLASH: add support for Ramtron FRAMs using SPI

[Peter Tyser]

Hi Mike,

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

You could save a step and using 'git add -p' instead of the patch
creation/edit/remove:
	git rebase -i <commit>^
	<mark the commit i want to split as "edit">
	<exit the rebase-todo window to start the process>
	git reset HEAD~1
	git add -p
	<go through changes, including, ignoring, splitting as needed>
	git commit
	<edit message to reflect reduced changes>
	git commit -a
	<edit message to reflect split out changes>
	git rebase --continue

This has the advantage that you can split up an individual hunk which
would be very difficult to do when editing a patch file.  The downside
is that 'git reset HEAD~1' makes it so that the original commit message
isn't preserved, so you have to re-enter or copy it.

Peter