Loading comment...
Readit NewsLoading parent story...
Sounds like "git reset" to me. Not sure, if it is, but this sounds to be easier in git.
I have used both Git and jj. I find it easier in jj.
`git reset` by itself doesn't split a commit AFAIK. You need to then `git add -p` and `git commit` (and recover the commit message from the old commit). And what happens if you had other changes in the working copy first? Or if you want to split a commit that's not at HEAD?
The work needed for the “I included something in a commit I want split out” [0] seems really complex, and it is something I do often.
Eg with stacked git (stg) this is just: goto, spill, and then refresh/create the stuff I want.
[0] https://docs.jj-vcs.dev/latest/faq/#i-accidentally-changed-f...
You can do that with just `jj split` too. The FAQ entry you linked to is for when you accidentally amended a commit and now you want to restore the bookmark to the old commit and move the changes you amended into a new commit on top instead.
martinvonz commented on Using Git add -p for fun (and profit) techne98.com/blog/using-g... · Posted by u/fixedprog
It runs on the last commit with the idea that it will all be squashed at merge. Are you worried about reverting some commits but not all?
That depends on the forge and the configuration of the forge. See the parent of the comment you replied to. Not everyone uses squash merge.
Loading parent story...
Loading comment...
martinvonz commented on Stacked Diffs with git rebase —onto dineshpandiyan.com/blog/s... · Posted by u/flexdinesh
Sounds like jj just simplifies the interface of some git commands, mainly. After talking to some jj enthusiasts here, I think we just have a different perspective about what needs to be simple and even what constitutes simple. There is probably some lingering unfamiliarity with git among jj enthusiasts as well. I don't want to teach git to people who are not programmers, but I wouldn't want to teach any programmer's VCS to them honestly. If you are a programmer, I think git is the best.
> There is probably some lingering unfamiliarity with git among jj enthusiasts as well.
I've heard this a few times. But from what I've seen, it seems like often it's the Git enthusiasts who seem to be unfamiliar with jj. I haven't heard from anyone who used jj for a few months and knew it well and then switched to Git.
Loading parent story...
Loading comment...
Loading parent story...
Loading comment...
Loading parent story...
Loading comment...
Loading parent story...
Loading comment...