Use Git to Plan and Build With Claude

Cassia Scheffer

01 Nov 2025 — 1 min read

When I shared my new JJ and Claude workflow last week, I wondered whether JJ was too much friction for developers. It requires learning a new version-control tool in addition to learning to use Claude. I had an idea in the back of my mind to use plain git for this.

And then Claude did it for me!

Towards the end of the week, I was working in a codebase where I hadn’t initialized JJ yet. Claude tried to use the JJ workflow, saw that JJ wasn’t initialized, and started implementing the same workflow using plain old git. We were working on a relatively simple feature, and Claude created planning commits and implemented it.

You Don’t Need to Learn a New Tool

JJ is a good workflow if you need a graph of related features. I find this happens most often when I’m building a new feature or working in an old codebase where I find bugs.

Most day-to-day work can be done in linear branches. Plus, everyone knows git already.

This morning, I worked with Claude to refine a CLAUDE.md that uses plain old git to plan and build features. This looks really promising so far.

Safe Claude Code Settings

Here are a few commands I have in my Claude Code deny-list to prevent bad things from happening. I wish Claude shipped with these by default! The following commands disallow Claude from force pushing and skipping pre-commit hooks. { "permissions": { "deny": [ "Bash(git push -f)"

Planning, Building, Reviewing: Why The JJ Workflow Works Better Than Git

After a week of experimenting with using git and jj to plan and build, I’ve landed on jj as the winner. Rebasing Kills the Git Workflow Automatic rebases are the winning feature here. When I tell Claude to update a change, it will automatically rebase all its descendants. This

Why is Claude Code Different from Cursor if they Both Use Claude?

I get this question often. Here’s how the story goes: * Someone complains that AI is bad because it just does a bunch of stuff for you really quickly and does it wrong. * I ask what tools they’re using, and they say they’re using Cursor because it’s

Use Jujutsu to Plan and Build with Claude

This week, I read about Steve Yegge’s Beads. I was skeptical. He writes like someone trying to prompt inject your LLM. But he’s always written that way. I tried beads, and it was pretty good. I wrote all of uplift using beads. But it was also pretty buggy.

You Don’t Need to Learn a New Tool

Read more

Safe Claude Code Settings

Planning, Building, Reviewing: Why The JJ Workflow Works Better Than Git

Why is Claude Code Different from Cursor if they Both Use Claude?

Use Jujutsu to Plan and Build with Claude