A series of articles on better merges with dedicated patch branches rather than cherry-picking from feature branches, with good graphs. I use cherry-pick often on my one-man projects and have confused myself with merge-base in the past, so this is probably a good reference for me to remember.