The 7-Minute Git Workflow That Keeps Me Sane (and My Repo From Looking Like a Crime Scene)

Donalda Feith — Mon, 11 Aug 2025 01:35:09 +0000

Git is powerful. It’s also a black hole where hours disappear if you’re still typing the same long commands you learned in 2014 or digging through a history full of “fix typo” commits from three months ago. I’ve whittled my daily routine down to something I can do without cursing into my soda. It’s fast, clean, and takes under seven minutes per task.

Make a new branch every time

git checkout -b feature/short-descriptive-name

No “one branch to rule them all.” Bug fixes, new features, experiments—each gets its own.

Stage only what you mean to commit

git add -p

Keeps you from cramming unrelated changes into one commit, which is basically code hoarding.

Keep commit messages short and clear Format:

[type] present-tense description

Example:

fix: correct typo in config loader

Rebase for cleanup, don’t merge

git pull --rebase origin main

Keeps history straight so you don’t need a red string conspiracy board to follow it later.

Squash before you send it off

git rebase -i HEAD~n

Replace n with however many commits you’re mashing together.

Push it up

git push -u origin feature/short-descriptive-name

This saves me from the “what fresh hell is this” moment when reviewing old code. History stays readable. Brain stays uncluttered. And if you’ve been treating your repo like a junk drawer, try this for a week. You won’t go back.

A Year Late to My Own Introduction

Donalda Feith — Mon, 11 Aug 2025 01:25:39 +0000

I’ve had this Dev.to account for a year and never posted. Time to fix that.

I’m Donalda, a PhD in Computer Science with more than two decades in full stack development. Most of my work has been on secure, scalable systems, and I’ve built for web, mobile, and cloud across multiple industries. I work in Python, TypeScript, C#, Dart, Rust, Kotlin, Swift, Scala, and a few others I can still remember without checking my notes.

I’m based in the mountains of North Carolina, where I split my time between coding, raising my 12-year-old son, and taking on side projects that tend to start as small fixes and turn into full rebuilds.

I joined Dev.to to share what I’ve learned, connect with other developers, and see what everyone else is building. If you work on interesting systems, or you’re dealing with a tricky technical problem, I’d like to hear about it.

DEV Community: Donalda Feith

The 7-Minute Git Workflow That Keeps Me Sane (and My Repo From Looking Like a Crime Scene)

A Year Late to My Own Introduction