cixel.bsky.social / config
dotfiles files and stuff
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

jj: tweak behavior of ub alias

Ehden Sinai f0f56353 6cbb28c8

+7 -3
+7 -3
nix/home-manager/jujutsu.nix
··· 16 16 push-bookmark-prefix = "ehden/push-"; 17 17 }; 18 18 19 + revset-aliases = { 20 + "closest_bookmark(to)" = "heads(::to & bookmarks())"; 21 + "closest_pushable(to)" = ''heads(::to & ~description(exact:"") & (~empty() | merges()))''; 22 + }; 23 + 19 24 aliases = { 20 25 l = [ "log" "-r" "(trunk()..@):: | (trunk()..@)-" "--no-pager" ]; 21 26 _l = [ "log" "-r" "(trunk()..@):: | (trunk()..@)-" "-T" "builtin_log_detailed" "--no-pager" ]; 22 27 lg = [ "log" "-r" "trunk()..@ | ::trunk()" ]; 23 28 _lg = [ "log" "-r" "trunk()..@ | ::trunk()" "-T" "builtin_log_detailed" ]; 24 29 25 - # NOTE: this is kinda unsafe because it can pull e.g main or next up if 26 - # i'm already caught up 27 - ub = [ "bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to=@" ]; 30 + # https://github.com/jj-vcs/jj/discussions/5568#discussioncomment-12674748 31 + ub = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"]; 28 32 29 33 rb = [ "rebase" "-d" "trunk()" ]; 30 34 s = [ "status" "--no-pager" ];