• un_ax@lemmy.sdf.org
    6·
    1 day ago

    I’ve been trying out Jujutsu recently.

    It’s compatible with git repos. The workflow takes a little while to get used to but can be nicer to work with.

    • tatterdemalion@programming.dev
      2·
      16 hours ago

      can be nicer

      Understatement. It solves almost every problem I’ve ever had with git.

      1. No more destructive commands. jj undo or jj op restore can always put you back into a good state.
      2. Merge conflicts can be ignored until you want to resolve them.
      3. No “unstaged files” to deal with. Just keep your .gitignores up to date and jj automatically tracks new files.
      4. Rebasing and patch management is just incredibly simple.
      5. It actually has a nice default view of the commit graph.

      I used to use StackedGit for a while before switching to Jujutusu. While stg is nice, I think jj is a huge improvement.

      • StrikeForceZero@programming.dev
        1·
        14 hours ago

        Aside from the obvious cases like pruning or garbage collection that remove orphaned or dangling commits, is there anything else destructive that git reflog can’t help recover from?