Re: request for documentation about branch surgery
On Mon, Jul 6, 2009 at 8:30 PM, Elijah Newren<newren@gmail.com> wrote:
Show 8 quoted lines
>> 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')
>
Elijah Newren <newren@gmail.com>