▲ | diggan 3 days ago | |||||||||||||||||||||||||
> you can always just “jj new” on top of an existing change then squash it down and get automatic rebase past that point Never used jj, but isn't that just `git commit --amend`? Lets you add/remove/change changes from the previous commit by basically overwritting it with a new changeset+message. | ||||||||||||||||||||||||||
▲ | yencabulator a day ago | parent | next [-] | |||||||||||||||||||||||||
I have yet to see anything in jj that isn't also a git operation, they're just emphasized and exposed differently, and the gg GUI makes some things more intuitive (and also makes screwing up your history accidentally much easier). | ||||||||||||||||||||||||||
| ||||||||||||||||||||||||||
▲ | scottgg 2 days ago | parent | prev | next [-] | |||||||||||||||||||||||||
You can do it to any change in the repo and everything gets automatically rebased downstream of it - so if you three nicely structured changes you can go change the first one if you need and it just works. I’m selling it short a bit - it does a lot more! There’s a great Steve Klabnik tutorial [1]. To me the main thing is it makes it very easy to think and work in terms of logical changes. | ||||||||||||||||||||||||||
| ||||||||||||||||||||||||||
▲ | trust_bt_verify 2 days ago | parent | prev [-] | |||||||||||||||||||||||||
Sounds like it may be closer to ‘git commit —fixup HEAD’ but same idea. |