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

GitHub

ssh access

This error:

[email protected]: Permission denied (publickey).
fatal: Could not read from remote repository.

is occasionally resolved by simply re-adding the ssh key for the current identity, in this case id_rsa, as defined in ~/.ssh/config:

ssh-add ~/.ssh/id_rsa

The gist linked here may be a useful resource.