News for hackers. Stuff that matters.
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video] by metabagel on Thursday October 30, 2025 @06:27PM (#45766148)
From time to time, I end up in a state which I don't know how to recover from, and it's very frustrating to have to take an hour or two from my real work in order to try to figure out how to get out of that state.

https://roadrunnertwice.dreamwidth.org/596185.html

Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video] by gorjusborg on Thursday October 30, 2025 @06:39PM (#45766233)
The reflog is the failsafe. It is the tool that fixes all the scary states, as it keeps a journal of the states of each ref in the repo (like branch heads).

You can see where you were and hard reset back, no matter what state you are in.

Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video] by steveklabnik on Thursday October 30, 2025 @06:53PM (#45766354)
If you like the reflog, you'll love jj's oplog: it's like the reflog, but for all repository state changes.