top | item 46264426

(no title)

tinodb | 2 months ago

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...

discuss

order

martinvonz|2 months ago

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.

1718627440|2 months ago

Sounds like "git reset" to me. Not sure, if it is, but this sounds to be easier in git.