🔒 Backup for my config files
dotfiles
update jj tug
+16
-8
+16
-8
.config/jj/config.toml
+16
-8
.config/jj/config.toml
···
25
25
graph.style = "curved"
26
26
27
27
[revset-aliases]
28
-
"wip()" = "description(glob:'wip:*')"
29
-
"private()" = "description(glob:'private:*')"
28
+
"closest_merge(to)" = "heads(::to & merges())"
30
29
31
-
"stack()" = "ancestors(reachable(@, mutable()), 2)"
32
-
"stack(x)" = "ancestors(reachable(x, mutable()), 2)"
33
-
"stack(x, n)" = "ancestors(reachable(x, mutable()), n)"
30
+
# tug
31
+
'closest_bookmark(to)' = 'heads(::to & bookmarks())'
32
+
'closest_pushable(to)' = 'heads(::to & ~description(exact:"") & (~empty() | merges()))'
34
33
35
34
[aliases]
36
-
ds = ["diff", "--stat"]
37
-
l = ["log", "-T", "builtin_log_compact"]
35
+
36
+
# Show detailed log
38
37
ll = ["log", "-T", "builtin_log_detailed"]
39
-
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
38
+
39
+
# Find the closest bookmark in history to advance it forward (edit workflow compatible)
40
+
tug = [
41
+
"bookmark",
42
+
"move",
43
+
"--from",
44
+
"closest_bookmark(@)",
45
+
"--to",
46
+
"closest_pushable(@)",
47
+
]