On 29.08.2010 06:34, Mike Frysinger wrote:
> 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 ...

That's slightly shorter than my method. I'll try it. And I think it can't
be shortened any further...

Reinhard
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to