2007/5/11, Matthieu Moy <Matthieu.Moy@xxxxxxx>:
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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
