From fec07f27bbc97c64123e1e3c5fac42808805e159 Mon Sep 17 00:00:00 2001 From: sloane Date: Fri, 1 Nov 2024 09:13:53 -0400 Subject: [PATCH] chore: jj calls them bookmarks now --- .config/fish/functions/fish_jj_prompt.fish | 2 +- .jjconfig.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/fish/functions/fish_jj_prompt.fish b/.config/fish/functions/fish_jj_prompt.fish index 41caaa3..9662d6e 100644 --- a/.config/fish/functions/fish_jj_prompt.fish +++ b/.config/fish/functions/fish_jj_prompt.fish @@ -20,7 +20,7 @@ function fish_jj_prompt --description 'Write out the jj prompt' ")", separate( " ", - branches.join(", "), + bookmarks.join(", "), coalesce( surround( "\"", diff --git a/.jjconfig.toml b/.jjconfig.toml index b2119a3..2302295 100644 --- a/.jjconfig.toml +++ b/.jjconfig.toml @@ -22,4 +22,4 @@ name = "sloane" log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @" [git] -push-branch-prefix = "sloane/push-" +push-bookmark-prefix = "sloane/push-"