-
Notifications
You must be signed in to change notification settings - Fork 113
Add jujutsu support #414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Add jujutsu support #414
Conversation
@jamessan seems the most recent reviewer |
588237e
to
4f7ebce
Compare
4f7ebce
to
348b881
Compare
Source at https://github.com/martinvonz/jj and hosted docs at https://martinvonz.github.io/jj/latest/.
348b881
to
b478b47
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, minor comment inline.
accurev | ||
perforce | ||
tfs | ||
jj |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jj should also be added to the list in the intro section of this document.
Can / should we (optionally) use |
I agree, we should definitely use the --ignore-working-copy flag. Without it, jj creates a snapshot of the working directory when invoked from within vim, which leads to a lot of divergent operations. |
You want FWIW, since the time I authored the inital patch I ended up writing my own neovim plugin that takes inspiration from |
patch originally authored by @algmyr
while the default diff does work, the 'working-copy-as-a-commit' semantics of jj mean that it may be preferable to customize the diff range to include the last non-anonymous commit. Unfortunately, there isn't currently an easy way to express this but the following should approximate it: