~/talk

jj: Simpler and More Powerful Than Git

Talkat TokioConf 2026 · 2026-04-20..04-22· [devops-and-delivery]
slides:none on file

Claim: a git‑compatible VCS called jj exists and is already used on Git repos and can replace git in practice; demo shows multiple backends including Git, commands like jj squash, split, new, push and workflows where a commit acts as the staging area instead of an index. JJ preserves stable identifiers while rewriting commits and automatically rebases descendants, lets conflicts be deferred, supports headless branches and mega merges, and the demo builds typo fixes and pushes a PR without leaving the current work.

AI-written summary · about

  1. 0:00Introduction
  2. 1:18JJ vs Git
  3. 2:41No staging area
  4. 4:03Incremental commits
  5. 5:26Fixing and splitting commits
  6. 6:49Push without branches
  7. 7:32Merge conflicts and rebasing
  8. 9:16Defer conflict resolution
  9. 9:57Merge commits and absorb
  10. 10:18Trying JJ
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.