The solution is to think of it as "it's both, snapshot and parent + diff". When you cherry-pick, git is using the parent+diff model to move the commit. When yo

The solution is to think of it as "it's both, snapshot and parent + diff". When you cherry-pick, git is using the parent+diff model to move the commit. When you do a merge commit, it's using the snapshot model.