config.toml (1506B)
1 [user] 2 name = "mtmn" 3 email = "miro@haravara.org" 4 5 [ui] 6 color = "auto" 7 8 diff-editor = ["difft", "--color", "always", "$left", "$right"] 9 10 merge-editor = "vimdiff" 11 log-format = 'separate(" ", format_short_change_id_with_hidden_and_divergent_info(self), bookmarks, description.first_line(), format_short_signature(author), "(" ++ format_timestamp(committer.timestamp()) ++ ")")' 12 13 log-word-wrap = true 14 default-command = "log" 15 16 [signing] 17 backend = "gpg" 18 sign-all = true 19 key = "miro@haravara.org" 20 21 [git] 22 push-bookmark-prefix = "push-" # used when jj git push --change creates a bookmark 23 default-branch = "master" 24 25 [merge-tools.vimdiff] 26 program = "nvim" 27 args = ["-f", "-d", "$left", "$merged", "$right", 28 "-c", "wincmd J", 29 "-c", "set modifiable", 30 "-c", "set write"] 31 merge-tool-edits-conflict-markers = false 32 33 [merge-tools.difft] 34 program = "difft" 35 diff-args = ["--color", "always", "$left", "$right"] 36 37 [revset-aliases] 38 "upstream()" = "latest(remote_bookmarks(remote=origin) & ancestors(@))" 39 "wip()" = "ancestors(@ | branches()) & mine()" 40 'closest_bookmark(to)' = 'heads(::to & bookmarks())' 41 42 [aliases] 43 lg = ["log", "-r", "::@", "--template", 'separate(" ", format_short_change_id_with_hidden_and_divergent_info(self), format_short_signature(author), description.first_line(), "(" ++ format_timestamp(committer.timestamp()) ++ ")")'] 44 wip = ["bookmark", "list", "--all"] 45 tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"] 46 47 [remotes.origin] 48 auto-track-bookmarks = "*"