From: Barry Roberts <blr@robertsr.us>
Date: Tue, 06 May 2008 16:15:35 GMT
Subject: Re: Noob question on using branches
Message-ID: <48208427.5080800@robertsr.us>
In-Reply-To: <vpqiqxrctio.fsf@bauges.imag.fr>

Matthieu Moy wrote:
> Barry Roberts <blr@robertsr.us> writes:
>
>   
>> I have a branch in my git repository that is a "released" branch.  It
>> only gets defect fixes as they are needed to patch our production
>> servers.
>>
>> I want to get all those defect fixes back into the master, but I don't
>> want changes from the master getting into the production branch, so I
>> don't think I want to do:
>> git checkout master
>> git merge production
>>     
>
> Why wouldn't you?
>
> The "git merge production" will take all the changes in production and
> put them in the current branch. You'll get a new revision that
> contains both the stuff in master and the one in production. But
> what's important is that the reference "master" is updated to that new
> revision, but "production" stays where it is.
>   
So it does.  That does appear to be exactly what I need.
> Just try it, then run "gitk --all" to see if the result is what you
> wanted. If not, "git reset --hard HEAD^" will move back "master" to
> where it used to be (read about "git reset" before you run it).
>
>