Hacker Newsnew | past | comments | ask | show | jobs | submit | icorbrey's commentslogin

Not sure on `jj init`, but yeah colocation is default as of I believe 0.34


Indeed, though I don't think it can create fixup commits if that's what you're looking for. However, it might work great for that if you pair it with jj-spr: https://github.com/LucioFranco/jj-spr


Megamerges are awesome, but what really makes them magical is when you start using `jj absorb`, which automatically splits and squashes your commit down to the nearest unambiguous commits and leaves anything that doesn't have an obvious place to live


I've been trying absorb recently and have found it rarely does anything and I just resort to squashes. Any idea what might be going on?


Absorb:

- Will not rewrite an immutable commit, of course. (Though you can tell it to, and for my personal repositories I sometimes actually set immutable() = root().)

- Will not do anything to diffs if it's uncertain where they should go, either because that file wasn't edited in a previous mutable commit, or because it was edited in multiple sibling/cousin commits. The latter is likely to happen with mega-merges.

You can use --into to restrict the set of target commits, if you already know what feature branch you're updating.


Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: