From: Wolfgang Denk Date: Mon, 06 Dec 2010 06:37:47 +0100 Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation In-Reply-To: <4CFC0966.4010303@emk-elektronik.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> <4CFC0966.4010303@emk-elektronik.de> Message-ID: <20101206053747.67954659@gemini.denx.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 Reinhard Meyer, In message <4CFC0966.4010303@emk-elektronik.de> you wrote: > > What's possible in git-rebase should be possible in git-am, too. git-rebase will also show merge conflicts in such cases. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de God may be subtle, but He isn't plain mean. - Albert Einstein