From: "Andreas Bießmann" <andreas.devel@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] AT91SAM9XE add embedded flash support
Date: Mon, 09 Aug 2010 08:34:22 +0200 [thread overview]
Message-ID: <4C5FA16E.9010506@googlemail.com> (raw)
In-Reply-To: <4C5F8E8E.4020802@emk-elektronik.de>
Dear Reinhard Meyer,
Am 09.08.2010 07:13, schrieb Reinhard Meyer:
> Wolfgang Denk wrote:
>> Dear "Reinhard Meyer (-VC)",
> So, simple question: how do I get a new patch against the original
> state after editing the file?
first of all you might want to have your patch against the current state
(not the one it was when you introduced your patch).
'git rebase' does the trick, e.g. 'git checkout <my patch branch> && git
rebase master'
Then you might want to do some changes to your first patch. Do them, and
a) 'git commit --amend' to add your changes to the very last commit
or b) 'git commit' a new commit and then use 'git rebase -i' to squash
the one in question together.
> commit + format-patch master does
> not do the trick. It produces a patch with the new changes only.
>
> Reinhard
rergards
Andreas Bie?mann
next prev parent reply other threads:[~2010-08-09 6:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-16 7:47 [U-Boot] [PATCH v2] AT91SAM9XE add embedded flash support Reinhard Meyer
2010-08-08 21:51 ` Wolfgang Denk
2010-08-09 5:13 ` Reinhard Meyer
2010-08-09 6:34 ` Andreas Bießmann [this message]
2010-08-09 7:08 ` Reinhard Meyer
2010-08-09 7:28 ` Andreas Bießmann
2010-08-09 7:39 ` Reinhard Meyer
2010-08-09 7:43 ` Alessandro Rubini
2010-08-09 7:46 ` Andreas Bießmann
2010-08-09 7:28 ` Andreas Bießmann
2010-08-09 16:00 ` [U-Boot] [PATCH v3] AT91SAM9XE: " 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=4C5FA16E.9010506@googlemail.com \
--to=andreas.devel@googlemail.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