Re: git-kill: rewrite history removing a commit

From: Yann Dirson <ydirson@altern.org>
Date: Jan 31, 2007, 20:22 UTC
Message-ID: <20070131202204.GB5362@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <20070131195533.GE21097@mellanox.co.il>

On Wed, Jan 31, 2007 at 09:55:33PM +0200, Michael S. Tsirkin wrote:

Show 6 quoted lines

> Below is a simple script that rewrites history reverting a single commit.
> This differs from git-revert in that a commit is completely removed,
> and is especially useful before one has published a series of
> commits.
> 
> Do you find this useful? Comments?

That may be well when no patch depends on the one you kill. In that case, it surely requires some work to handfix things.

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>

And if there is any conflict, you can still solve them, decide to change your plans, get diffs from gitk, etc.

Best regards,

-- 
Yann.