From: Catalin Marinas <catalin.marinas@arm•com>
To: Yann Dirson <ydirson@altern•org>
Cc: "Michael S. Tsirkin" <mst@mellanox•co.il>,
Junio C Hamano <junkio@cox•net>,
git@vger•kernel.org
Subject: Re: git-kill: rewrite history removing a commit
Date: Thu, 01 Feb 2007 12:41:05 +0000 [thread overview]
Message-ID: <tnxzm7yhwym.fsf@arm.com> (raw)
In-Reply-To: <20070131202204.GB5362@nan92-1-81-57-214-146.fbx.proxad.net> (Yann Dirson's message of "Wed, 31 Jan 2007 21:22:04 +0100")
Yann Dirson <ydirson@altern•org> wrote:
> I'd suggest to use stgit to prepare commits before publication. Even
> if you don't feel the need for it in everyday life, you can have a
> one-shot use for this particular problem, by turning your latest
> commits into an stgit stack, use stgit facilities to handle posible
> conflicts, and turn them into commits again:
>
> The nominal case goes:
>
> stg init
> stg uncommit -n <ncommits>
> stg float <patch-to-kill>
> stg delete <patch-to-kill>
or "stg pop <patch-to-kill>" instead of 'float'. Recently, I changed the
'pop' command to accept individual patches and patch ranges (for
symmetry with 'push').
--
Catalin
next prev parent reply other threads:[~2007-02-01 12:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-31 19:55 git-kill: rewrite history removing a commit Michael S. Tsirkin
2007-01-31 20:22 ` Yann Dirson
2007-02-01 12:41 ` Catalin Marinas [this message]
2007-01-31 20:26 ` Junio C Hamano
2007-01-31 20:54 ` Michael S. Tsirkin
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=tnxzm7yhwym.fsf@arm.com \
--to=catalin.marinas@arm$(echo .)com \
--cc=catalin.marinas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
--cc=mst@mellanox$(echo .)co.il \
--cc=ydirson@altern$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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