From: Elijah Newren <newren@gmail.com>
Date: Tue, 07 Jul 2009 03:45:22 GMT
Subject: Re: request for documentation about branch surgery
Message-ID: <51419b2c0907062045p648d5478x88515261249a2d79@mail.gmail.com>
In-Reply-To: <51419b2c0907061930k71e20b42rb347b9ab8923e437@mail.gmail.com>

On Mon, Jul 6, 2009 at 8:30 PM, Elijah Newren<newren@gmail.com> wrote:
>>  This is achieved by
>>
>>    $ git checkout master
>>    $ git reset --hard E      # Cut the branch "master"
>>    $ git merge released      # Copy commits from branch "released" to "master"
>
> I'm assuming master isn't checked out.  If so, the following is faster:
>  $ git branch -f master E

Sorry, I meant
  $ git branch -f master released
because we want to set master to the tip of the released branch, not to E.

> (If master is checked out, just 'git reset ---hard released')
>