From: Albert ARIBAUD <albert@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation
Date: Sun, 05 Dec 2010 21:00:06 +0100 [thread overview]
Message-ID: <4CFBEF46.8090202@aribaud.net> (raw)
In-Reply-To: <4CFBE49B.303@emk-elektronik.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.
next prev parent reply other threads:[~2010-12-05 20:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-30 19:45 [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation Andreas Bießmann
2010-11-30 19:45 ` [U-Boot] [PATCH v2 1/4] at91rm9200ek: add configure target for RAM boot Andreas Bießmann
2010-11-30 19:45 ` [U-Boot] [PATCH v2 2/4] MAKEALL: fix AT91 Andreas Bießmann
2010-11-30 19:45 ` [U-Boot] [PATCH v2 3/4] arm920t/at91/reset: board_reset: define weak symbol Andreas Bießmann
2010-12-02 19:00 ` Jens Scharsig
2010-11-30 19:45 ` [U-Boot] [PATCH v2 4/4] arm920t/at91/timer: replace bss variables by gd Andreas Bießmann
2010-11-30 19:58 ` [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation Reinhard Meyer
2010-11-30 22:20 ` Andreas Bießmann
2010-12-05 9:53 ` Reinhard Meyer
2010-12-05 17:43 ` Andreas Bießmann
2010-12-05 17:56 ` Albert ARIBAUD
2010-12-05 18:05 ` Andreas Bießmann
2010-12-05 19:14 ` Reinhard Meyer
2010-12-05 20:00 ` Albert ARIBAUD [this message]
2010-12-05 22:05 ` Reinhard Meyer
2010-12-05 21:04 ` Wolfgang Denk
2010-12-05 21:24 ` Reinhard Meyer
2010-12-05 21:42 ` Wolfgang Denk
2010-12-05 21:51 ` Reinhard Meyer
2010-12-06 5:37 ` Wolfgang Denk
2010-12-06 5:56 ` Reinhard Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CFBEF46.8090202@aribaud.net \
--to=albert@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox