jj-sync

rebase all bookmarks alias
2024-11-19 16:08:51 -05:00 · 2024-11-19 15:54:27 -05:00
2 changed files with 8 additions and 0 deletions
--- a/.config/fish/functions/jj-sync.fish
+++ b/.config/fish/functions/jj-sync.fish
@ -0,0 +1,5 @@
+function jj-sync
+    jj git fetch
+    jj rebase -b 'all:bookmarks() & mine() ~ trunk()' -d 'trunk()' --skip-emptied
+    jj git push --tracked
+end
--- a/.jjconfig.toml
+++ b/.jjconfig.toml
@ -24,3 +24,6 @@ log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @"

 [git]
 push-bookmark-prefix = "sloane/push-"
+
+[aliases]
+rebase-bookmarks = ["rebase", "-b", "all:bookmarks() & mine() ~trunk()", "-d", "main", "--skip-emptied"]
Author	SHA1	Message	Date
sloane	fb3750706d	jj-sync	2024-11-19 16:08:51 -05:00
sloane	cd5c7c3248	rebase all bookmarks alias	2024-11-19 15:54:27 -05:00