From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 15 Feb 2011 09:29:05 GMT
Subject: Re: configuring cherry-pick to always use -x?
Message-ID: <4D5A4761.6010308@drmicha.warpmail.net>
In-Reply-To: <20110215091828.GA22661@elie>

Jonathan Nieder venit, vidit, dixit 15.02.2011 10:18:
> Michael J Gruber wrote:
> 
>> - If you do want them on the same branch "f-release", you probably know
>> beforehand which commits you don't want on master. You can fake-merge
>> these ("merge -Xours") to master and merge the others
> 
> For the record, I think that should be -sours.
> 
> I think it's just a typo but the difference is big --- -sours means
> "supersede by pretending to merge but actually keeping our version",
> while -Xours means "do a normal merge but be sloppy and favor our
> change when encountering adjacent or overlapping changes".

Yes, sorry and thanks.

-Xours may still be useful to know for the OP, but for the complete
fake-merge you need -sours. In fact, "-sours" has an awfully good
mnemonic when used for fake-merging commits which you do not want to
cherry-pick :)

Michael