Git

Under the hood

• Julia Evans’ blog is a great resource for understanding how Git works.
• A Visual Guide to Git Internals — Objects, Branches, and How to Create a Repo From Scratch

The hard parts

• How git cherry-pick and revert use 3-way merge
• Git, detached HEAD - Flavio Copes

Maybe useful?

• Obscure but useful Git incantations

🎗

Combining the current commit with an earlier commit where target commit < most recent commit:

git commit --fixup=<commit hash>
git rebase -i --autosquash main

(alternately, use an identifier from the target message)

git commit --fixup :/<some-identifying-text-from-target-commit-message>

Version control more generally…

Jujutsu docs

Omit .DS_Store from git

Add this line to .gitignore:

**/.DS_Store

… and to remove the file after the first push to remote:

git rm --cached .DS_Store