1 files changed,
11 insertions(+),
2 deletions(-)
Author:
Oleksandr Smirnov
olexsmir@gmail.com
Committed at:
2026-03-02 13:44:49 +0200
Parent:
0c7a96b
M
config/jj/config.toml
··· 17 17 18 18 [git] 19 19 sign-on-push = true 20 -private-commits = "description(glob:'wip:*') | description(glob:'private:*')" 20 +private-commits = "private()" 21 21 22 22 [remotes] 23 23 origin.auto-track-bookmarks = "glob:*" ··· 25 25 upstream.auto-track-bookmarks = "main | master" 26 26 27 27 [aliases] 28 +e = ["edit"] 28 29 l = ["log", "-r", "ancestors(reachable(@, mutable()), 2)"] 29 30 llog = ["log", "-r", ".."] 30 -tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] 31 +n = ["new"] 32 +restack = ["rebase", "-d", "trunk()", "-s", "mutable_roots()"] 33 +tug = ["bookmark", "move", "--from", "closest_bookmark(@)", "--to", "closest_pushable(@)"] 34 + 35 +[revset-aliases] 36 +"private()" = "description(glob:'private:*') | description(glob:'wip:*')" 37 +"mutable_roots()" = "roots(trunk()..) & mutable()" 38 +"closest_bookmark(to)" = "heads(::to & bookmarks())" 39 +"closest_pushable(to)" = "heads(::to & ~description(exact:'') & (~empty() | merges()))" 31 40 32 41 [templates] 33 42 git_push_bookmark = '"olexsmir/" ++ change_id.short()'