From: Peter Tyser <ptyser@xes-inc.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] MTD/SPI/FLASH: add support for Ramtron FRAMs using SPI
Date: Tue, 07 Sep 2010 15:12:19 -0500 [thread overview]
Message-ID: <1283890339.26713.369.camel@petert> (raw)
In-Reply-To: <201008290034.23557.vapier@gentoo.org>
Hi Mike,
> 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 ...
You could save a step and using 'git add -p' instead of the patch
creation/edit/remove:
git rebase -i <commit>^
<mark the commit i want to split as "edit">
<exit the rebase-todo window to start the process>
git reset HEAD~1
git add -p
<go through changes, including, ignoring, splitting as needed>
git commit
<edit message to reflect reduced changes>
git commit -a
<edit message to reflect split out changes>
git rebase --continue
This has the advantage that you can split up an individual hunk which
would be very difficult to do when editing a patch file. The downside
is that 'git reset HEAD~1' makes it so that the original commit message
isn't preserved, so you have to re-enter or copy it.
Peter
next prev parent reply other threads:[~2010-09-07 20:12 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
2010-08-29 4:52 ` Reinhard Meyer
2010-09-07 20:12 ` Peter Tyser [this message]
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=1283890339.26713.369.camel@petert \
--to=ptyser@xes-inc.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.