Re: I screw up git release/unstable

[Reinhold Kainhofer]

Am Montag, 5. Juli 2010, 14:10:23 schrieb Graham Percival:
> On Mon, Jul 5, 2010 at 12:37 PM, David Kastrup <address@hidden> wrote:
> > There are basically two ways to do that.  One is more or less a relabel
> > and would consequentially lose history.
> 
> If it loses history from release/unstable, I consider that a desirable
> side effect.
> 
> AFAIK I'm the only one who uses release/unstable, so that's not a huge
> concern.
> 
> Do whichever is easiest/safest for you, please.

I think it's easiest to simply do (on your release/unstable copy, assuming 
your local branch is also called release/unstable):

git reset --hard origin/master
git push -f origin release/unstable

This will move the release/unstable branch tag to current origin/master (git 
push would not normally allow a push that looses commits, so you have to force 
it...). I have used that every now and then to reset dev/kainhofer to master.

Cheers,
Reinhold


-- 
------------------------------------------------------------------
Reinhold Kainhofer, address@hidden, http://reinhold.kainhofer.com/
 * Financial & Actuarial Math., Vienna Univ. of Technology, Austria
 * http://www.fam.tuwien.ac.at/, DVR: 0005886
 * LilyPond, Music typesetting, http://www.lilypond.org