From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert@aribaud.net>
Date: Sun, 05 Dec 2010 21:00:06 +0100
Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM
	relocation
In-Reply-To: <4CFBE49B.303@emk-elektronik.de>
References: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com>
	<4CFB6107.9060000@emk-elektronik.de>
	<B03204B0-191F-4841-B20C-B77A48062ED2@googlemail.com>
	<4CFBD250.1050502@aribaud.net>
	<90F3B181-8AA6-438C-855C-A78824261760@googlemail.com>
	<4CFBE49B.303@emk-elektronik.de>
Message-ID: <4CFBEF46.8090202@aribaud.net>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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.

> Best Regards,
> Reinhard

Amicalement,
-- 
Albert.