Git question

Steve Dickson SteveD at redhat.com
Tue Aug 24 13:35:31 UTC 2010



On 08/24/2010 09:27 AM, Andy Shevchenko wrote:
> On Tue, Aug 24, 2010 at 4:21 PM, Jochen Schmitt <Jochen at herr-schmitt.de> wrote:
>>  Am 24.08.10 14:55, schrieb Steve Dickson:
>>> How I merge the latests changes from the remotes/origin/f13/master
>>> on to my f13/user/steved/pnfs-13 remote branch?
>>>
>> I think git cherry-pick is the command whar you want to use.
> cherry-pick is useful when you take patches from one _custom_ branch to another.
> I case of master branch the rebase is more convenient, I think.
I do know and have used git cherry-pick before but in this particular
case I agree with Andy that git rebase was the way to go... 

Thanks for the replies!! 

steved. 


More information about the devel mailing list