From c0bbff81a36809495d3728fcea65c51b6071368a Mon Sep 17 00:00:00 2001 From: "Thomas G. Lopes" Date: Fri, 13 Mar 2026 13:41:19 +0000 Subject: [PATCH] jj --- pi/files/agent/AGENTS.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pi/files/agent/AGENTS.md b/pi/files/agent/AGENTS.md index 3f6655d..da4f441 100644 --- a/pi/files/agent/AGENTS.md +++ b/pi/files/agent/AGENTS.md @@ -4,9 +4,13 @@ When the user provides a screenshot path (e.g., `/tmp/pi-clipboard-xxx.png`), ** --- +# Version control + +**Prefer jj (Jujutsu) over git.** If a project has a colocated jj repo (`.jj` directory), use `jj` commands for all version control operations — rebasing, branching, log, etc. Only fall back to git when jj doesn't support something or the project isn't set up for it. + # Git commits and PRs -Before writing any commits or PR titles, check recent git history with `git log --oneline -20` to match my style. +Before writing any commits or PR titles, check recent history with `jj log` (or `git log --oneline -20` if jj is unavailable) to match my style. My commit style: