3 ms·

1. You wouldn’t use git rere with jj, so that’s sort of a nonsequitor. 2. You treat @ (the working copy) like the staging area, @- (the parent of the working c

1. You wouldn’t use git rere with jj, so that’s sort of a nonsequitor. 2. You treat @ (the working copy) like the staging area, @- (the parent of the working copy) as the commit you’re working on, and then jj squash -i (“interactive”) the parts of the diff you want back into @.

Ericson2314 1y ago
If I use JJ in my existing git clone, and then use the occasional git command, I don't want rerere to be messed up
- steveklabnik 1y ago
  In general you don’t want to mix git mutating commands with jj commands. I believe that there might be a way to get jj to resync its understanding of the word, but I’m not sure what it is off the top of my head. In rere’s case specifically, I’d expect you’d just be using jj’s rebase, so it shouldn’t be needed though of course want and need are different things.
  - Ericson2314 1y ago
    Mmm I see. Getting out of sync sounds very bad! https://lore.kernel.org/git/CAESOdVAspxUJKGAA58i0tvks4ZOfoGf1Aa5gPr0FXzdcywqUUw@mail.gmail.com/T/#u https://lore.kernel.org/git/CAESOdVAspxUJKGAA58i0tvks4ZOfoGf... I hope this happens, because then it seems like far less state would be needed on the jj side.
    - steveklabnik 1y ago
      It definitely will be nice, but I’m not super heartened by the conversation that ensued. It also doesn’t super change jj itself, in the sense that it still needs to support other backends, but it does simplify the git backend.
      - Ericson2314 1y ago
        I did not read the whole thread, but I didn't encounter anyone saying "no", just tepid bike-shedding.
didibus 1y ago
I think the issue for me will be that IDEs tend to show diff with head, I'm not even sure you can configure them otherwise.
- steveklabnik 1y ago
  I’m not a big “VCS in an IDE” person but visualjj works for vs code, and there’s other plugins to, I hear. If your IDE isn’t configurable and assumes certain things then it might not work, yeah.
  - didibus 1y ago
    I don't mean VCS UI, I mean that in the project view and when viewing source files, the editor highlights added, removed and changed lines and normally if you click on it it shows the diff at that code block. Generally IDEs will be diffing against head or staging and it's not very configurable.
    - steveklabnik 1y ago
      Yeah, visualjj does that stuff. But for sure, if your IDE isn’t configurable there’s not much that can be done.

Ericson2314 1y ago

If I use JJ in my existing git clone, and then use the occasional git command, I don't want rerere to be messed up

steveklabnik 1y ago
In general you don’t want to mix git mutating commands with jj commands. I believe that there might be a way to get jj to resync its understanding of the word, but I’m not sure what it is off the top of my head. In rere’s case specifically, I’d expect you’d just be using jj’s rebase, so it shouldn’t be needed though of course want and need are different things.
- Ericson2314 1y ago
  Mmm I see. Getting out of sync sounds very bad! https://lore.kernel.org/git/CAESOdVAspxUJKGAA58i0tvks4ZOfoGf1Aa5gPr0FXzdcywqUUw@mail.gmail.com/T/#u https://lore.kernel.org/git/CAESOdVAspxUJKGAA58i0tvks4ZOfoGf... I hope this happens, because then it seems like far less state would be needed on the jj side.
  - steveklabnik 1y ago
    It definitely will be nice, but I’m not super heartened by the conversation that ensued. It also doesn’t super change jj itself, in the sense that it still needs to support other backends, but it does simplify the git backend.
    - Ericson2314 1y ago
      I did not read the whole thread, but I didn't encounter anyone saying "no", just tepid bike-shedding.

didibus 1y ago

I think the issue for me will be that IDEs tend to show diff with head, I'm not even sure you can configure them otherwise.

steveklabnik 1y ago
I’m not a big “VCS in an IDE” person but visualjj works for vs code, and there’s other plugins to, I hear. If your IDE isn’t configurable and assumes certain things then it might not work, yeah.
- didibus 1y ago
  I don't mean VCS UI, I mean that in the project view and when viewing source files, the editor highlights added, removed and changed lines and normally if you click on it it shows the diff at that code block. Generally IDEs will be diffing against head or staging and it's not very configurable.
  - steveklabnik 1y ago
    Yeah, visualjj does that stuff. But for sure, if your IDE isn’t configurable there’s not much that can be done.