From: Reinhard Meyer Date: Sun, 05 Dec 2010 22:51:34 +0100 Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation In-Reply-To: <20101205214204.CF89FD08AB4@gemini.denx.de> References: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com> <4CFB6107.9060000@emk-elektronik.de> <4CFBD250.1050502@aribaud.net> <90F3B181-8AA6-438C-855C-A78824261760@googlemail.com> <4CFBE49B.303@emk-elektronik.de> <20101205210449.EDB66D08AB4@gemini.denx.de> <4CFC031F.9020300@emk-elektronik.de> <20101205214204.CF89FD08AB4@gemini.denx.de> Message-ID: <4CFC0966.4010303@emk-elektronik.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Wolfgang Denk, > Dear Reinhard Meyer, > > In message<4CFC031F.9020300@emk-elektronik.de> you wrote: >> >>> First, try to figure out why this happen. >> >> Simply because boards.cfg was completely resorted (a few days ago) since the patch was made--- > > Well, the changes to boards.cfg are usually one-liners, so it's easy > to add these manually (Just add them as last text line, and re-sort) Sure I can remove the changes to boards.cfg completely and later add them manually and squash it in. But I was expecting a less "hacking" way to do that. What's possible in git-rebase should be possible in git-am, too. Best Regards, Reinhard