News for hackers. Stuff that matters.

A comment on Git cherry-pick and revert use 3-way merge. Parent comment

Re:Git cherry-pick and revert use 3-way merge by pertymcpert on Friday November 10, 2023 @02:59PM (#38223731)
Of course it's defined, even git knows what it means because that's what cherry-pick does.
[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by recursive on Friday November 10, 2023 @05:30PM (#38225453)
So cherry-pick is actually merge, and rebase is actually cherry-pick?

Everything is merge.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by pertymcpert on Tuesday November 14, 2023 @12:53PM (#38266829)
No, cherry-pick is cherry-pick. Rebase is a composite action which includes one or more cherry-picks.
[ Parent | on HN ]