Re: Repo cleanup problem

"Eugine Kosenko" <eugine.kosenko@gmail.com> writes:

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.

Then, to have git-gc remove the old, bad, history, you need to remove any reference you have to it: branches and tags. git-branch -d and perhaps git-tag -d will tell you.

See also git-fsck that can point you to dangling objects, which should then be removed by git-gc.

gitk --all, on the other hand, will show you the commits to which you have a reference (and their ancestry).