From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter Tyser <ptyser@xes-inc.com>
Date: Tue, 07 Sep 2010 15:12:19 -0500
Subject: [U-Boot] [PATCH] MTD/SPI/FLASH: add support for Ramtron FRAMs
 using SPI
In-Reply-To: <201008290034.23557.vapier@gentoo.org>
References: <1282740439-7910-1-git-send-email-u-boot@emk-elektronik.de>
	<201008282227.00264.vapier@gentoo.org>
	<4C79D56C.5030304@emk-elektronik.de>
	<201008290034.23557.vapier@gentoo.org>
Message-ID: <1283890339.26713.369.camel@petert>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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