diff --git a/plugins/jj/README.md b/plugins/jj/README.md index c9e490edf..6e6716973 100644 --- a/plugins/jj/README.md +++ b/plugins/jj/README.md @@ -55,7 +55,7 @@ plugins=(... jj) | jjopl | `jj op log` | | jjor | `jj op restore` | | jjrb | `jj rebase` | -| jjrbm | `jj rebase -d "trunk()"` | +| jjrbm | `jj rebase -o "trunk()"` | | jjrs | `jj restore` | | jjrt | `cd "$(jj root \|\| echo .)"` | | jjs | `jj show` | @@ -120,10 +120,10 @@ that. ### Git async-prompt compatibility -If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with -the default git async-prompt mode. This is because async-prompt only registers its background worker -when it detects `$(git_prompt_info)` literally in your prompt variables. A wrapper like -`$(_my_theme_vcs_info)` won't match, so the async output stays empty. +If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with the default +git async-prompt mode. This is because async-prompt only registers its background worker when it detects +`$(git_prompt_info)` literally in your prompt variables. A wrapper like `$(_my_theme_vcs_info)` won't match, +so the async output stays empty. To fix this, add one of the following to your `.zshrc` **before** Oh My Zsh is sourced: diff --git a/plugins/jj/jj.plugin.zsh b/plugins/jj/jj.plugin.zsh index 90b8d7b08..f12176085 100644 --- a/plugins/jj/jj.plugin.zsh +++ b/plugins/jj/jj.plugin.zsh @@ -81,7 +81,7 @@ alias jjop='jj op' alias jjopl='jj op log' alias jjor='jj op restore' alias jjrb='jj rebase' -alias jjrbm='jj rebase -d "trunk()"' +alias jjrbm='jj rebase -o "trunk()"' alias jjrs='jj restore' alias jjrt='cd "$(jj root || echo .)"' alias jjs='jj show'