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