Glossary

Search and filter commands for git → jj

All 35 commands

git

git init

jj git init

git clone <url>

jj git clone <url>

git status

jj status (jj st)

git log

jj log

git diff

jj diff

git diff --staged

jj diff --from @-(No staging area in jj)

git add . && git commit -m "msg"

jj describe -m "msg"(Changes auto-tracked)

git commit --amend

jj describe (on @)(Edit working commit)

(start new work)

jj new(Creates new working commit)

git checkout <commit>

jj new <commit>(Create new commit at parent)

git checkout <commit> (edit)

jj edit <commit>(Make commit the working copy)

git rebase -i (fixup)

jj squash(Squash into parent)

git rebase -i (split)

jj split(Interactive split)

git rebase <onto>

jj rebase -d <onto>(Descendants auto-rebase)

git cherry-pick <commit>

jj new <parent>; jj squash --from <source>(Two-step process)

git show <commit>

jj show <commit>

git branch <name>

jj bookmark create <name>(jj uses bookmarks)

git checkout -b <name>

jj new; jj bookmark create <name>(No current branch concept)

git branch -d <name>

jj bookmark delete <name>

git branch -m <old> <new>

jj bookmark rename <old> <new>

git branch

jj bookmark list

git fetch

jj git fetch

git push

jj git push(Requires bookmark)

git push -u origin <branch>

jj git push -b <bookmark>(jj requires bookmark name)

git pull

jj git fetch; jj rebase -d <bookmark>@origin(No pull, use fetch+rebase)

git reflog; git reset --hard

jj undo(Undo last operation)

(see operation history)

jj op log(View all operations)

git reset --hard <commit>

jj op restore <operation>(Restore to any operation)

git revert <commit>

jj new <commit>; jj new; jj describe -m "Revert"(Manual revert process)

git status (see conflicts)

jj status(Conflicts stored in commit)

git add <resolved>

jj resolve(Mark conflict resolved)

(view conflicts)

jj resolve --list(List all conflicts)

git log --graph --oneline

jj log --graph

(find commits to rebase)

jj log -r 'main..@'(Revset: commits since main)

git describe

jj describe(Show full change id)