From: Adam Nielsen <adam.nielsen@uq.edu.au>
Date: Fri, 12 Mar 2010 07:12:23 GMT
Subject: Re: How do you switch branches in a bare repo?
Message-ID: <4B99E957.60905@uq.edu.au>
In-Reply-To: <4B99E5DD.3020005@viscovery.net>

>> How do you switch between branches in a bare repo?
> 
> You don't have to. This should work:
> 
>    git push -f . newbranch~2:newbranch
> 
> will remove the last two commits at the tip of 'newbranch'.
> 
> Of course, you can do the push from any other repository as long as you
> are allowed to do non-fast-forward pushes into the bare repository.

Thanks for the suggestion!  Unfortunately it looks like I'm not allowed 
to do non-fast-forward pushes into my own repository because I keep 
getting this error:

error: denying non-fast-forward refs/heads/newbranch (you should pull first)
  ! [remote rejected] newbranch~2 -> newbranch (non-fast-forward)

I tried using a + in front of the branch name as recommended by the 
manpage but it didn't change anything :-(

Any further suggestions?

Thanks again,
Adam.