From mboxrd@z Thu Jan 1 00:00:00 1970 From: Graeme Russ Date: Mon, 08 Dec 2008 19:04:52 +1100 Subject: [U-Boot] [PATCH 12/15] Fixed CONFIG_SYS_SC520_RESET for eNET board In-Reply-To: <20081208064112.GD27485@game.jcrosoft.org> 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> Message-ID: <493CD524.4050900@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Jean-Christophe PLAGNIOL-VILLARD wrote: > On 10:29 Sun 07 Dec , Graeme Russ wrote: >> Forgotten in commit d1f2d102a266804a50ff0cd9794459791f057c94 >> >> Signed-off-by: Graeme Russ >> --- >> include/configs/eNET.h | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) > please do this at the sametime you rename the macro > > Best Regards, > J. > 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? Sorry, but I'm still getting used to git Regards, Graeme