git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Tilman Schmidt <tilman@imap.cc>, git@vger.kernel.org
Subject: Re: how to create v2 patch
Date: Sat, 1 Dec 2007 15:14:10 +0100	[thread overview]
Message-ID: <20071201141410.GA4430@atjola.homenet> (raw)
In-Reply-To: <m3r6i6wm1g.fsf@roke.D-201>

On 2007.12.01 06:02:23 -0800, Jakub Narebski wrote:
> 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

      reply	other threads:[~2007-12-01 14:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-01 12:41 how to create v2 patch Tilman Schmidt
2007-12-01 13:17 ` Pascal Obry
2007-12-01 13:43   ` Mike Hommey
2007-12-06 20:04     ` Tilman Schmidt
2007-12-06 20:44       ` Jan Hudec
2007-12-06 21:38       ` Pascal Obry
2007-12-06 22:03       ` Andreas Ericsson
2007-12-07  8:11       ` Wincent Colaiuta
2007-12-01 14:02 ` Jakub Narebski
2007-12-01 14:14   ` Björn Steinbrink [this message]

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=20071201141410.GA4430@atjola.homenet \
    --to=b.steinbrink@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=tilman@imap.cc \
    /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).