From fb3750706ded79f6019bb321caa02fa04a8080ea Mon Sep 17 00:00:00 2001
From: sloane <git@sloanelybutsurely.com>
Date: Tue, 19 Nov 2024 16:08:51 -0500
Subject: [PATCH] jj-sync

---
 .config/fish/functions/jj-sync.fish | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .config/fish/functions/jj-sync.fish

diff --git a/.config/fish/functions/jj-sync.fish b/.config/fish/functions/jj-sync.fish
new file mode 100644
index 0000000..34aed79
--- /dev/null
+++ 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