Re:Git cherry-pick and revert use 3-way merge
by oasisaimlessly on Friday November 10, 2023 @03:39PM
(#38224206)
The output of 'git merge-base' is the base (of the 3-way diff) used when doing a normal merge. That's all.
Other (non-merge) operations like cherry-pick and revert use a different base commit. If you squint, you can view these operations as a merge with an abnormally-chosen base commit, which is the whole point here.
Other (non-merge) operations like cherry-pick and revert use a different base commit. If you squint, you can view these operations as a merge with an abnormally-chosen base commit, which is the whole point here.