boltless.me
+12
-1
jj/config.toml
+12
-1
jj/config.toml
···
3
3
[aliases]
4
4
su = ["squash"]
5
5
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
6
+
# mega-merge pull
7
+
mp = ["rebase", "-b", "MM", "-d", "heads(MM- | trunk())"]
6
8
7
9
[ui]
8
-
default-command = ["log", "--no-pager"]
10
+
default-command = ["log", "--no-pager", "-r", "@ | coalesce(mega_merge(), default()) | trunk()"]
9
11
should-sign-off = true
10
12
diff-formatter = ["difft", "--color=always", "--syntax-highlight=off", "$left", "$right"]
11
13
# diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
···
23
25
24
26
[git]
25
27
write-change-id-header = true
28
+
private-commits = "description(glob:'wip:*') | description(glob:'private:*')"
29
+
30
+
[revset-aliases]
31
+
'MM' = "description('[mega-merge]')"
32
+
'FP' = "fork_point(MM-)"
33
+
'wip' = "description(glob:'wip:*')"
34
+
'default()' = "@ | ancestors(immutable_heads().., 2) | trunk()"
35
+
'show(x)' = "@ | ancestors(..(x::) ~ immutable(), 2) | trunk()"
36
+
'mega_merge()' = "ancestors(..(MM::) ~ immutable(), 2)"
26
37
27
38
[templates]
28
39
draft_commit_description = '''