jj: update pull alias
change vnyymxmmxwxzwrzzpwlroxtomznwyutp
commit 62eb5791506d4a2fb67f802c8285d60ddd1498fe
author Alpha Chen <alpha@kejadlen.dev>
date
parent uzovxtmz
diff --git a/.config/jj/config.toml b/.config/jj/config.toml
index ce6a322d..3dd2db45 100644
--- a/.config/jj/config.toml
+++ b/.config/jj/config.toml
@@ -137,8 +137,10 @@ pull = ["util", "exec", "--", "bash", "-c", """
   # so the megamerge keeps merging a colleague's immutable branch. Excluding
   # the direct children of non-trunk immutable commits leaves work we have
   # stacked on someone else's branch in place.
-  jj rebase --source "roots(mutable()) ~ (immutable() ~ ::trunk())+" --destination "trunk()"
-  jj simplify-parents
+  jj rebase \
+    --source "roots(trunk()..reachable(@, mutable()))" \
+    --onto "trunk()" \
+    --simplify-parents
   jj sweep
 """]