jj

2026-03-13 13:41:19 +00:00
parent 58dd9d8c2b
commit c0bbff81a3
1 changed files with 5 additions and 1 deletions
@@ -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: