• 0 Posts
  • 9 Comments
Joined 2 years ago
cake
Cake day: June 12th, 2023

help-circle




  • Right, you need to first restart the rebase, then git reset --hard to whatever commit from the reflog, then edit the todo list. Might need git rebase --skip too to make it read the next entry. I haven’t done this myself yet fwiw.

    It says it can use Git as backend, so that means I could do these kinds of operations easily without stringing several commands together on the repositories I’m already working on without changing them?

    You can either clone a repo fresh or have it take over an existing git repo that you already have cloned locally. Normally you can only use its own commands, but you can create a repo in colocated mode where you can use both git and jj commands in the same repository, if that’s something you or a tool you’re using needs.

    But in general jj will work with remote git repositories regardless of whether your local checkout is colocated or not, and there’s no problem using it side-by-side on the same repo with other people who use git.

    I posted an article (not mine) about it here a while ago. https://discuss.tchncs.de/post/26573114