From: Eugine Kosenko <eugine.kosenko@gmail.com>
Date: Fri, 11 May 2007 09:32:13 GMT
Subject: Re: Repo cleanup problem
Message-ID: <9909dee80705110232m5ef56517i542728ef8657971e@mail.gmail.com>
In-Reply-To: <vpqveezhjb0.fsf@bauges.imag.fr>

2007/5/11, Matthieu Moy <Matthieu.Moy@imag.fr>:
> Branch before the garbage commit. Then, you can use git-rebase to
> replay the correct history on top of your new branch. Note that
> git-rebase will break merging if you already used merge: it does not
> "move" your old commits to your new branch, it instead creates new
> commits with the same changes at the old ones, in the new branch.
>
> That's probably what you've done already.

Almost that. Unfortunately, this simple way causes unexpected
conflicts, so I need also to do sometimes 'git-checkout <tag> .' and
recommit the changes to force the process.