What's up ? 📰

News 🗞️

Jujutsu 🗞️

Jujutsu: another VCS

Jujutsu: arretez GIT !

🆚

Jujutsu

❤️

Jujutsu

✨ gestion des conflits ✨

changes vs. commit

bookmark vs. branch

Premiers pas: les changes

Changes

$ jj git init

$ jj log

$ jj st

Change ID

Commit ID

Changes

$ touch README.md

$ jj log

$ jj st

Changes

$ jj describe -m "doc: begin the story"

$ jj log

$ jj st

Changes

$ echo "# This is the beginning of everything" > README.md

$ jj log

$ jj st

Changes

$ jj new

$ jj log

$ jj st

Bookmarks

$ jj bookmark create "pizza-doc"

$ jj log

$ jj st

Bookmarks

$ [..]

$ jj log

$ jj st

Bookmarks

$ jj bookmark set pizza-doc -r @

$ jj log

$ jj st

Conflicts

$ jj new tlqotxyp -m "doc: switch to BURGEEERS"
$ echo "BURGERS BURGERS. only burgers\n\nMais aussi du contenu :)" >> README.md

$ jj log

$ cat README.md

# This is the beginning of everything
BURGERS BURGERS. only burgers

Mais aussi du contenu :)

Conflicts

$ jj rebase -s q -d n

$ jj log

$ cat README.md

# This is the beginning of everything
BURGERS BURGERS. only burgers

Mais aussi du contenu :)

Conflicts

$ jj edit q

$ jj log

$ cat README.md

# This is the beginning of everything
<<<<<<< Conflict 1 of 1
+++++++ Contents of side #1
BURGERS BURGERS. only burgers

Mais aussi du contenu :)
%%%%%%% Changes from base to side #2
+## A pizza story
>>>>>>> Conflict 1 of 1 ends

Conflicts

$ vim ( ou emacs ( ou code ( ou cursor ( ou zed ))))

$ jj log

$ cat README.md

# This is the beginning of everything
Mais aussi du contenu :)

## A pizza story

Mais aussi...

$ jj undo

Mais aussi...

$ jj squash -f msnztxwv -t qyopvuru

Mais aussi...

$ jj split qyopvuru

Warnings ⚠️

pas de precommit hook 😭

pas de submodules 🙄

🏗️ en developpement actif 🚧

🍔 Enjoy ! 🍕

Et merci :)

https://jj-vcs.github.io/jj/latest/tutorial/

https://korben.info/jj-jujutsu-version-control-alternative.html

https://steveklabnik.github.io/jujutsu-tutorial/