Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by steveklabnik on Friday October 31, 2025 @04:37PM
(#45776438)
Oh yeah I forgot HEAD Is a ref, whoops. Duh! (My git is getting rusty at this point...)
jj still ends up keeping information in here that the reflog doesnt, but you're right that these aren't the strongest points.
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by martinvonz on Friday October 31, 2025 @05:02PM
(#45776661)
One little benefit of the op log is that you can use a single `jj undo` to undo all the rebased branches/bookmarks in one go. If you have rebased many branches with `git rebase --update-refs`, you need to reset each of the branches separately AFAIK.
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by 1718627440 on Monday November 03, 2025 @10:18AM
(#45799986)
--update-refs, --no-update-refs
Automatically force-update any branches that point to commits that
are being rebased. Any branches that are checked out in a worktree
are not updated in this way.
If the configuration variable rebase.updateRefs is set, then this
option can be used to override and disable this setting.
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by martinvonz on Tuesday November 04, 2025 @01:04AM
(#45807828)
Are you saying that that text implies that the you can undo the rebase with a single command or that all the reflogs get updated atomically? Or how is it related to the comment you replied to?
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by 1718627440 on Tuesday November 04, 2025 @03:24AM
(#45808667)
Oops. No the text implies that I can't read and answered to a claim which you didn't state, namely that --update-refs can only update specific refs. (This was given by another comment.)
Yes, this is something, that JJ provides and Git does not.
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by 1718627440 on Friday October 31, 2025 @04:53PM
(#45776578)
Which, the stuff you said earlier is in the reflog?
I think Git will just gain a oplog. You just need to append a commit hash to a list before each command and implement undo as remove item and checkout. The hardest thing will be race conditions, but Git already knows how to be a database.
> The reflog only tracks individual refs. Say we rebase multiple commits. The reflog still just says "the head of this branch was in state x and changed to state y" but the oplog says "a rebase happened, it affected all of these commits refs in these ways," that is, it's just inherently more rich in what it tracks, and does it across all relative commits, not only the refs.