←back to thread

Jujutsu for everyone

(jj-for-everyone.github.io)
434 points Bogdanp | 2 comments | 31 Aug 25 15:31 UTC | HN request time: 0s | source
Show context
IshKebab ◴[31 Aug 25 18:03 UTC] No.45085363[source]▶
Another question for jj people: one concrete thing I find annoying with Git is that it's completely incapable or rebasing anything with merge commits. Can jj do this? Even very simple merges are too much for git to rebase. It's especially annoying with `git subtree`. If I want to rebase anything to do with that I don't bother now - I just start again from scratch.
replies(3): >>45086048 #>>45086902 #>>45086938 #
1. 1718627440 ◴[31 Aug 25 20:48 UTC] No.45086938[source]▶
What does git rebase --rebase-merges do in this case? How does it botch up the repo?
replies(1): >>45090521 #
2. IshKebab ◴[01 Sep 25 07:51 UTC] No.45090521[source]▶
I can't remember exactly but I have tried it a couple of times and couldn't get it to work at all.