Great article. The first thing that I was told about git was that commits are snapshots. It is enough to understand the simple workflow: pull, commit -a, push.

Great article. The first thing that I was told about git was that commits are snapshots. It is enough to understand the simple workflow: pull, commit -a, push. What confused me was everything that involves applying diffs (git stash apply, git rebase, git cherry-pick). The secret is that you need to think both in terms of snapshots, or diffs, depending on the context. Some git tutorials show you a few "magic" commands to get you started but it's best to really understand the git model as soon as possible. It's not that hard, and it's here to stay. We may still be using git in 30 years, just like we're still using bash and vim.