Re: how to create v2 patch

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Dec 1, 2007, 14:14 UTC
Message-ID: <20071201141410.GA4430@atjola.homenet>
In-Reply-To: <m3r6i6wm1g.fsf@roke.D-201>

On 2007.12.01 06:02:23 -0800, Jakub Narebski wrote:

Show 14 quoted lines

> Tilman Schmidt <tilman@imap.cc> writes:
> 
> > Let's say that following the scheme laid out in
> > "Everyday GIT ...", chapter "Individual Developer (Participant)".
> > I have produced a patch, submitted it to LKML, received a few
> > comments, committed appropriate changes to my local git tree,
> > and now want to submit a revised patch. How do I do that?
> 
> If you have original commit and commit with corrections on top of it,
> do a squash rebase using "git rebase -i" (interactive), or do a squash
> merge.
> 
> In the future it would be better to just amend ("git commit --amend")
> original commit (or if you are using StGIT, "stg refresh" it).

For completeness: To use "git commit --amend" for any but the latest commit, you use rebase -i, too. Just change the "pick" for the commit you want to amend to "edit". Rebasing will stop _after_ applying that commit and you can amend it.

Björn