From: sean <seanlkml@sympatico.ca>
Date: Thu, 16 Mar 2006 15:21:45 GMT
Subject: Re: git-reset and clones
Message-ID: <BAYC1-PASMTP0354DF2E1D7C62E86C43D9AEE70@CEZ.ICE>
In-Reply-To: <44197C04.5080400@op5.se>

On Thu, 16 Mar 2006 15:53:56 +0100
Andreas Ericsson <ae@op5.se> 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