[U-Boot] [PATCH 12/15] Fixed CONFIG_SYS_SC520_RESET for eNET board

Peter Tyser ptyser at xes-inc.com
Mon Dec 8 17:32:31 CET 2008


Hi Graeme,

> What is the easiest (or best) way of achieving this. The only way I can
> think of is to:
>  - Roll back my history to the commit before d1f2d102a
>  - Use patch to apply d1f2d102a
>  - Add this change
>  - Commit the resulting changes
>  - Use git-am to apply the remaining patches
> 
> Is this the correct way of doing it?

The steps you mention should work, but can be a bit time-consuming. git
rebase --interactive should do what you want - its useful for
combining/splitting/re-ordering previous commits.

http://www.andrewmoore.com/public/index.php/My_git_workflow is a nice
reference.

Best,
Peter




More information about the U-Boot mailing list