Mastodon

Welcome to Larvitz Blog! I’m Christian, a Senior Consultant by day and FreeBSD enthusiast by night, with over 20 years in enterprise IT. Here I write about FreeBSD jails, PF firewalling, self-hosting, Linux system administration, and anything that’s cleanly engineered. Most articles are hands-on guides born from running my own infrastructure, from dual-stack networking and Ansible automation to hosting a Mastodon instance on FreeBSD.

Have a question or want to discuss something? Find me on the Fediverse at @Larvitz@burningboard.net. I’m always happy to chat!

#worktree Articles


  • Mon 16 November 2026
  • Linux

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.