Mastodon

I’m Christian: Senior Consultant by day, FreeBSD person by conviction. Hands-on writeups about jails, BGP, self-hosting and Linux, all from infrastructure I actually run.

#git Articles


Newest

Git Beyond the Basics: Worktrees, Cherry-Picks and Signed Commits

Almost every Git tutorial stops after add, commit, push and a merge conflict. The tools that make Git pleasant in daily work get far less attention: worktrees for parallel feature branches, cherry-picks for backports, fixup commits and autosquash for clean history, the reflog for recovering from mistakes, and signed commits that prove who made them. This article starts with the mental model and the basics, then works through the parts I actually use, including signing with an OpenPGP smartcard through oct-git.

Earlier articles

Hardware Keys Without GnuPG: The Rust OpenPGP Card Stack, Now in FreeBSD Ports

Three small Rust tools from the OpenPGP Card project replace the GnuPG stack for my everyday hardware key work: oct to manage OpenPGP cards and Nitrokeys, oct-git to sign Git commits, and openpgp-card-ssh-agent as a hardware-backed SSH agent. I ported all three to FreeBSD and they are now in the ports tree. This article explains what each tool does, how they share PIN handling, and how I set them up on Fedora and on my FreeBSD T480.

Chezmoi and Git: Dotfiles Without Pretending Every Machine Is the Same

A Git repository is a good place for configuration files, but it does not know where they belong, which permissions they need, or why a work laptop and a home server should differ. Chezmoi adds that missing layer. This is how I use both tools to manage fish, Git, Neovim, GnuPG, OpenSSH and Atuin, including the recovery command for the inevitable day I edit a live file directly.