On Thu, 16 Mar 2006 15:53:56 +0100
Andreas Ericsson [off-list ref] wrote:
In mothership-repo:
git checkout master
git branch next-master ORIGIN
git rebase next-master; # fix conflicts and commit
git branch -d master
git checkout -b master next-master
git -d next-master
git revert (the bad commits)
Downstream repos may still be broken afterward though; not much
you can do about that unfortunately.
Sean