From: Scott Wood <scottwood@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] OMAP3: Rename interrupts.c to timer.c
Date: Fri, 08 May 2009 13:41:20 -0500 [thread overview]
Message-ID: <4A047CD0.7020602@freescale.com> (raw)
In-Reply-To: <4A047B71.6080704@googlemail.com>
Dirk Behme wrote:
> Scott Wood wrote:
>> It can be applied with "git am" (well, not the diffstat, but the special
>> rename diff hunk that git also generates).
>
> Ok, thanks. But not with other tools, like plain 'patch', correct?
Right, until someone fixes that. :-)
Which I suppose could be a problem if "git am" refuses to accept the
patch and the normal patch command needs to be used to resolve the
conflict (I really wish git would treat it more like a merge from a UI
perspective, even if it doesn't look that way internally).
-Scott
next prev parent reply other threads:[~2009-05-08 18:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-05 15:41 [U-Boot] [PATCH 0/3] OMAP3: Minor code clean up, no functional change Dirk Behme
2009-05-05 15:41 ` [U-Boot] [PATCH 1/3] OMAP3: Remove dublicated interrupt code Dirk Behme
2009-05-05 15:41 ` [U-Boot] [PATCH 2/3] OMAP3: Rename interrupts.c to timer.c Dirk Behme
2009-05-05 15:41 ` [U-Boot] [PATCH 3/3] OMAP3: Reorganize Makefile style Dirk Behme
2009-05-07 20:42 ` Jean-Christophe PLAGNIOL-VILLARD
2009-05-08 15:30 ` Dirk Behme
2009-05-07 20:41 ` [U-Boot] [PATCH 2/3] OMAP3: Rename interrupts.c to timer.c Jean-Christophe PLAGNIOL-VILLARD
2009-05-08 15:47 ` Dirk Behme
2009-05-08 18:23 ` Scott Wood
2009-05-08 18:35 ` Dirk Behme
2009-05-08 18:41 ` Scott Wood [this message]
2009-05-11 6:58 ` Wolfgang Denk
2009-05-08 19:29 ` Wolfgang Denk
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=4A047CD0.7020602@freescale.com \
--to=scottwood@freescale.com \
--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