Re: cherry-pick '-m' curiosity

"G. Sylvie Davies" writes: > On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: >> Hello, >> >> $ git help cherry-pick >> >> -m parent-number, --mainline parent-number >>Usually you cannot cherry-pick a merge because you do not >>

Re: cherry-pick '-m' curiosity

On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: > Hello, > > $ git help cherry-pick > > -m parent-number, --mainline parent-number >Usually you cannot cherry-pick a merge because you do not >know which side of the merge should be considered the >

Re: cherry-pick '-m' curiosity

Junio C Hamano writes: > Sergey Organov writes: > >> Isn't it always the case that "mainline" is the first parent, as that's >> how "git merge" happens to work? > > You may not be merging into the "mainline" in the first place. > > Imagine forking two

Re: cherry-pick '-m' curiosity

Stefan Beller writes: > On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: >> Hello, >> >> $ git help cherry-pick >> >> -m parent-number, --mainline parent-number >>Usually you cannot cherry-pick a merge because you do not >>

Re: cherry-pick '-m' curiosity

On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: > Hello, > > $ git help cherry-pick > > -m parent-number, --mainline parent-number >Usually you cannot cherry-pick a merge because you do not >know which side of the merge should be considered the >

Re: cherry-pick '-m' curiosity

Sergey Organov writes: > Isn't it always the case that "mainline" is the first parent, as that's > how "git merge" happens to work? You may not be merging into the "mainline" in the first place. Imagine forking two topics at the same commit on the mainline, and merging