[gmx-developers] porting a commit from 4.6 to master

[Berk Hess]

On 11/26/2013 09:35 AM, David van der Spoel wrote:
> On 2013-11-26 09:05, Berk Hess wrote:
>> Hi,
>>
>> I have a commit on top of release-4-6 and want to also have it on top of
>> master. Doing git cherry-pick results in conflicts for all files, since
>> all files have been moved.
>> Is there a way to port the commit and have git resolve the file movement
>> automatically?
>>
>> Cheers,
>>
>> Berk
>>
> What's wrong with merge?
Can I merge a single commit?
If I do git merge <commit>, I get all commits after the last merge of 
4.6 into master plus a merge commit itself. I would like to have just a 
(the) single commit.

Cheers,

Berk
>
> Cherry pick is more for the other way around IIRC.
>