From: Reinhard Meyer Date: Sun, 05 Dec 2010 23:05:40 +0100 Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation In-Reply-To: <4CFBEF46.8090202@aribaud.net> 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> <4CFBEF46.8090202@aribaud.net> Message-ID: <4CFC0CB4.3040403@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 Albert ARIBAUD, > Le 05/12/2010 20:14, Reinhard Meyer a ?crit : > >> Sorry, the branch name might be a misnomer. As soon as I got two other >> patches applied, >> I'll issue a pull request. > > You mean your /next branch will be merged to your /master and you'll request a pull of /master ? > >> How do I resolve this? When there is a problem with git-rebase I get the >> offending >> files merged with the conflicting parts between <<<,===,>>> >> respectively. Easy to >> edit that. But with git-am I don't seem to get such an option? > > Add --reject to your git am command. It will produce a .rej fil which contains the rejected hunks for each failed patch. At least my version does not have --reject, but using git-am --skip after the failed git-am leads exactly to what I need: the patchable files ready to be committed, and the problematic files with the <<<,===,>>> markings... Best Regards, Reinhard