From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 01 Feb 2007 12:41:05 GMT
Subject: Re: git-kill: rewrite history removing a commit
Message-ID: <tnxzm7yhwym.fsf@arm.com>
In-Reply-To: <20070131202204.GB5362@nan92-1-81-57-214-146.fbx.proxad.net>

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