#git

The commands for 'is this branch ahead/behind', 'what's the common ancestor', and 'what will merging this actually bring in' — gathered in one place instead of re-derived from log/diff each time.

"ours" and "theirs" mean opposite things depending on whether you're merging or rebasing — because rebase replays your own commits as if they were incoming patches onto a different HEAD. Every combination, in one place.

Push a branch, then ask for it to be reviewed and merged — using the GitHub CLI so it never leaves the terminal.

Push a vX.Y.Z tag and let GitHub Actions test, publish a versioned image to GHCR and create a GitHub Release with generated notes and attached binaries.

Git stops and asks you to decide when the same lines were changed on both sides. Here's the sequence that gets you out cleanly.

Stages changes moves them from your working directory into the snapshot that the next commit will record.

Applies patches produced by `git format-patch` as real commits, preserving the original author, date, and message — the classic 'email a patch' workflow, still used for offline or cross-repo patch exchange.

Branches are cheap, disposable pointers to a commit. Create one per feature or fix and switch between them freely.

Applies one or more specific commits from anywhere onto the current branch, without merging or rebasing the whole line they came from.

Copies a remote repository — full history included — into a new local directory and wires up 'origin' automatically.

Records the staged snapshot as a new point in history, with a message explaining why, not just what.