From: Peter Tyser Date: Mon, 08 Dec 2008 10:32:31 -0600 Subject: [U-Boot] [PATCH 12/15] Fixed CONFIG_SYS_SC520_RESET for eNET board In-Reply-To: <493CD524.4050900@gmail.com> References: <1228606151-10839-4-git-send-email-graeme.russ@gmail.com> <1228606151-10839-5-git-send-email-graeme.russ@gmail.com> <1228606151-10839-6-git-send-email-graeme.russ@gmail.com> <1228606151-10839-7-git-send-email-graeme.russ@gmail.com> <1228606151-10839-8-git-send-email-graeme.russ@gmail.com> <1228606151-10839-9-git-send-email-graeme.russ@gmail.com> <1228606151-10839-10-git-send-email-graeme.russ@gmail.com> <1228606151-10839-11-git-send-email-graeme.russ@gmail.com> <1228606151-10839-12-git-send-email-graeme.russ@gmail.com> <1228606151-10839-13-git-send-email-graeme.russ@gmail.com> <20081208064112.GD27485@game.jcrosoft.org> <493CD524.4050900@gmail.com> Message-ID: <1228753951.16562.41.camel@localhost.localdomain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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