From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?ISO-8859-1?Q?Andreas_Bie=DFmann?= <andreas.devel@googlemail.com>
Date: Mon, 09 Aug 2010 08:34:22 +0200
Subject: [U-Boot] [PATCH v2] AT91SAM9XE add embedded flash support
In-Reply-To: <4C5F8E8E.4020802@emk-elektronik.de>
References: <4C400E81.8070208@emk-elektronik.de>	<20100808215141.3D8F61536EF@gemini.denx.de>
	<4C5F8E8E.4020802@emk-elektronik.de>
Message-ID: <4C5FA16E.9010506@googlemail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.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