Re: check if a commit is ascendent of a specific commit

From: Karl Hasselström <kha@treskal.com>
Date: Nov 11, 2006, 12:12 UTC
Message-ID: <20061111121259.GB11224@diana.vm.bytemark.co.uk>
In-Reply-To: <200611111256.20157.jnareb@gmail.com>

On 2006-11-11 12:56:19 +0100, Jakub Narebski wrote:

Show 14 quoted lines

> Dnia sobota 11. listopada 2006 12:31, Nguyen Thai Ngoc Duy napisa??:
>
> > Yes. That's what I want. I am tempted to edit older commits just
> > because I forgot to add some entries to .gitignore that I should
> > have added sooner :-)
>
> In pure git you would have to create new branch at the commit you
> want to amend, amend the commit (in this branch), and rebase (or
> cherry-pick if you need to edit other commits too) the rest, then
> rename branch. Or if you don't want ot loose reflog, tag/branch
> current branch, then reset (rewind) current branch to the commit you
> want to amend, then cherry-pick.
>
> Or you can use cg-admin-rewritehist tool from Cogito.

In case the history you want to edit is linear (that is, merge-free), StGIT is an excellent tool. It is very easy to go back to a previous commit (stg pop), amend it (stg refresh), and replay the following commits on top of the amended commit (stg push).

-- 
Karl Hasselström, kha@treskal.com