1 files changed,
13 insertions(+),
10 deletions(-)
Author:
Oleksandr Smirnov
olexsmir@gmail.com
Committed at:
2026-03-08 00:47:59 +0200
Parent:
d8d6418
M
config/jj/config.toml
··· 5 5 email = "olexsmir@gmail.com" 6 6 7 7 [ui] 8 -default-command = "l" 8 +default-command = ["log", "-r", "stack()"] 9 9 editor = "nvim" 10 10 pager = "delta" 11 11 diff-editor = ":builtin" ··· 26 26 27 27 [aliases] 28 28 e = ["edit"] 29 -l = ["log", "-r", "ancestors(reachable(@, mutable()), 2)"] 30 29 llog = ["log", "-r", ".."] 31 30 restack = ["rebase", "-d", "trunk()", "-s", "mutable_roots()"] 32 31 sync = ["util", "exec", "--", "sh", "-c", "jj git fetch && jj new 'trunk()'"] 33 -tug = ["bookmark", "move", "--from", "closest_bookmark(@)", "--to", "closest_pushable(@)"] 32 +tug = ["bookmark", "advance"] 33 + 34 +[revsets] 35 +bookmark-advance-to = "closest_pushable(@)" 36 +bookmark-advance-from = "closest_bookmark(@)" 34 37 35 38 [revset-aliases] 36 39 "private()" = "description(glob:'private:*') | description(glob:'wip:*')" 40 +"stack()" = "ancestors(reachable(@, mutable()), 2)" 41 +"user(x)" = "author(x) | committer(x)" 37 42 "mutable_roots()" = "roots(trunk()..) & mutable()" 38 43 "closest_bookmark(to)" = "heads(::to & bookmarks())" 39 44 "closest_pushable(to)" = "heads(::to & ~description(exact:'') & (~empty() | merges()))" 40 45 41 46 [templates] 42 47 git_push_bookmark = '"olex/" ++ change_id.short()' 43 -draft_commit_description = ''' 44 -concat( 45 - coalesce(description, default_commit_description, "\n"), 46 - "JJ: ignore-rest\n", 47 - diff.git(), 48 -) 49 -''' 48 +draft_commit_description = "builtin_draft_commit_description_with_diff" 50 49 51 50 [template-aliases] 52 51 "format_timestamp(timestamp)" = "timestamp.ago()" ··· 57 56 58 57 [fix.tools.gofumpt] 59 58 command = ["gofumpt"] 59 +patterns = ["glob:'**/*.go'"] 60 + 61 +[fix.tools.goimports] 62 +command = ["goimports"] 60 63 patterns = ["glob:'**/*.go'"] 61 64 62 65 [fix.tools.gleam]