Ancestors

Written by blinry on 2024-12-29 at 17:56

I've been trying the jujutsu (#jj) version control system over the past few weeks, and I think I really like it! It's Git-compatible, which means that you can use it right now with existing project, and to collaborate with others!

Using it feels similar to when I used git-svn to collaborate with people who insisted on using SVN back in university…

=> More informations about this toot | More toots from blinry@chaos.social

Written by blinry on 2024-12-29 at 18:01

Here's some things that feel nice about #jj:

• It doesn't force you to deal with conflicts immediately (for example, while you're rebasing a branch). Instead, you can do it later, once you're ready.

• Changes (jj's "commits") have a stable id, even if you rewrite them.

• Anonymous branches! No need to invent silly branch names when the commits already describe what the branch does.

=> More informations about this toot | More toots from blinry@chaos.social

Written by blinry on 2024-12-29 at 18:05

• There's no index anymore! Changes you make to files are recorded automatically. Instead of using git add -p to put partial changes in a commit, you can use jj split, and use a diff editor of your choice to split up edits you've done into multiple changes.

• Many commands work on the current working copy by default, but you can also directly run them on older changes! For example, You can jj split an older change into two!

[#]jj

=> More informations about this toot | More toots from blinry@chaos.social

Written by Julia Evans on 2024-12-29 at 19:09

@blinry do you run into any problems with files automatically being staged? one thing that put me off jj is that i frequently keep untracked files around for a long time (but don’t want to explicitly .gitignore them for whatever reason) and it’s annoying to have to constantly jj split them

=> More informations about this toot | More toots from b0rk@jvns.ca

Written by Michael Pratt on 2024-12-30 at 07:44

@b0rk @blinry This does bother me a bit. Binaries in particular are problematic because jj doesn’t want to bloat the repo by adding large binaries, so jj status will just completely error out and refuse to do anything if there is an untracked binary.

I don’t have a good solution for this currently.

=> More informations about this toot | More toots from prattmic@hachyderm.io

Written by blinry on 2024-12-31 at 14:25

@b0rk @prattmic

It hasn't been a problem for me yet, since I usually don't keep untracked files around.

But it seems that since version 0.22, you can add

[snapshot]

auto-track = "none()"

to #jj's config file, and it won't automatically start tracking new files!

This comment summarizes it especially well: https://github.com/jj-vcs/jj/issues/323

=> More informations about this toot | More toots from blinry@chaos.social

Written by Julia Evans on 2024-12-31 at 15:58

@blinry oh that's awesome thanks!

=> More informations about this toot | More toots from b0rk@jvns.ca

Toot

Written by Carsten 🚀✨ on 2024-12-31 at 17:45

@blinry interesting, I have untracked files a lot too because I use a minority OS in my team. jj sounds interesting, might give it a try on my private machines.

=> More informations about this toot | More toots from cringe@social.tchncs.de

Descendants