dotfiles/jj_config.toml at master · mrnugget/dotfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json"

[user]
name = "Thorsten Ball"
email = "mrnugget@gmail.com"

[aliases]
# tug: bring nearest bookmark up to recent commit
tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"]

# retrunk:
# `jj rebase -d 'trunk()'` is shorthand for `jj rebase -b @ -d 'trunk()'`
#
# What that does:
#
# `-b @` rebases the entire branch that the current @ is on relative to the destination. (Default),
# `-d trunk()` sets the destination. trunk() finds the most recent `main | master | trunk` branch thats on a remote. trunk() is builtin.
retrunk = ["rebase", "-d", "trunk()"]


# collapse:
# combine all of the revs from the current one to the start of the "branch" into one
collapse = ["squash", "-f", "branch_start(@)+::@", "-t", "branch_start(@)"]

lr = ["log", "-r", "all()", "-n", "10"]

[revset-aliases]
"closest_bookmark(to)" = "heads(::to & bookmarks())"

# From indigo
"branch_start(to)" = "heads(::to & trunk())+ & ::to"

# From mitchellh
[template-aliases]
"format_timestamp(timestamp)" = "timestamp.ago()"

[ui]
default-command = "log"
diff-editor = ":builtin"
merge-editor = ":builtin"

[signing]
behavior = "own"
backend = "ssh"
key = "~/.ssh/id_ed25519.pub"