From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] MTD/SPI/FLASH: add support for Ramtron FRAMs using SPI
Date: Sun, 29 Aug 2010 00:34:22 -0400 [thread overview]
Message-ID: <201008290034.23557.vapier@gentoo.org> (raw)
In-Reply-To: <4C79D56C.5030304@emk-elektronik.de>
On Saturday, August 28, 2010 23:35:08 Reinhard Meyer wrote:
> On 29.08.2010 04:26, Mike Frysinger wrote:
> > On Saturday, August 28, 2010 21:59:26 Reinhard Meyer wrote:
> >> On 29.08.2010 02:14, Mike Frysinger wrote:
> >>> if you want to take the patch i posted and extend that by itself with
> >>> the comments here, and then do the ramtron patch separately on top of
> >>> that, that'd be great.
> >>
> >> Hehe, you like to impose extra work on poor moi....
> >
> > i can do the pre-ramtron stuff if you like
>
> No, I meant the splitting of the patch into two. As I said, the commit is
> about 10 back in my working tree, and I see no simple way of splitting the
> changes...
>
> When I insert the table method at TOT, I can easy squash that back into
> the old commit, but I still have one patch then. How do I suck the ramtron
> specifics out of Makefile, spi_flash.c, spi_flash_internal.h without
> un-editing them, committing, re-adding, committing?
when you're editing a commit in the middle of a rebase, you can add on any
number of commits you like on top of it. so usually the way i split commits:
git rebase -i <commit>^
<mark the commit i want to split as "edit">
<exit the rebase-todo window to start the process>
git format-patch -1
<edit the patch and keep all the hunks i want to split out>
patch -p1 -R < 0001-*
git commit -a --amend
<edit message to reflect reduced changes>
patch -p1 < 0001-*
git commit -a -c HEAD
<edit message to reflect split out changes>
git rebase --continue
maybe someone out there can suggest some shortcuts to my process ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20100829/d31284b9/attachment.pgp
next prev parent reply other threads:[~2010-08-29 4:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 12:47 [U-Boot] [PATCH] MTD/SPI/FLASH: add support for Ramtron FRAMs using SPI Reinhard Meyer
2010-08-26 2:31 ` Mike Frysinger
2010-08-26 5:57 ` Reinhard Meyer
2010-08-26 6:12 ` Mike Frysinger
2010-08-26 6:24 ` Reinhard Meyer
2010-08-26 8:27 ` Reinhard Meyer
2010-08-26 9:11 ` Mike Frysinger
2010-08-26 20:00 ` Reinhard Meyer
2010-08-28 21:48 ` Mike Frysinger
2010-08-28 22:15 ` Reinhard Meyer
2010-08-28 22:26 ` Mike Frysinger
2010-08-28 23:17 ` Mike Frysinger
2010-08-28 23:45 ` Reinhard Meyer
2010-08-29 0:14 ` Mike Frysinger
2010-08-29 1:59 ` Reinhard Meyer
2010-08-29 2:26 ` Mike Frysinger
2010-08-29 3:35 ` Reinhard Meyer
2010-08-29 4:34 ` Mike Frysinger [this message]
2010-08-29 4:52 ` Reinhard Meyer
2010-09-07 20:12 ` Peter Tyser
2010-09-07 19:38 ` 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=201008290034.23557.vapier@gentoo.org \
--to=vapier@gentoo.org \
--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;
as well as URLs for NNTP newsgroup(s).