On: Commits are shapshots, not diffs

[zokier]

Yeah, git cherry-pick is basically just git diff | git apply. And rebase is just cherry-picking many commits.

[aidos → zokier]

Exactly. And the other day I did exactly that with piping diff through apply so I had more control over conflicts I was hitting. Suspect all the years in svn just make it easier for me to think of it that way rather than some magical operation.