Use mm bookmark as an alternative stack base
The stack alias now picks whichever is closer to @: the nearest
merge commit or the mm bookmark. Also expanded abbreviated flags
for readability.
Assisted-by: Claude Opus 4.6 via pi
diff --git a/.config/jj/config.toml b/.config/jj/config.toml
index 69a67a3a..8d0c1a16 100644
--- a/.config/jj/config.toml
+++ b/.config/jj/config.toml
@@ -106,7 +106,12 @@ tug = ["util", "exec", "--", "bash", "-c", """
ref=${1:-@}
jj bookmark move --from "closest_bookmark($ref)" --to "closest_pushable($ref)"
""", ""]
-stack = ["rebase", "-A", "trunk()", "-B", "closest_merge(@)", "-r"]
+stack = [
+ "rebase",
+ "--insert-after", "trunk()",
+ "--insert-before", "heads(closest_merge(@) | mm)",
+ "--revisions"
+]
pr = ["util", "exec", "--", "bash", "-c", """
gh pr create --head \
$(jj log -r 'closest_bookmark(@)' -T 'bookmarks' --no-graph | cut -d ' ' -f 1)