diff --git a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl index cb0dddb..4aaf9fb 100644 --- a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl +++ b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl @@ -3,19 +3,10 @@ name = {{ .name | quote }} email = {{ .email | quote }} [git] -push-branch-prefix = "thermokarst/jj-" - -[revsets] -log = "@ | bases | branches | curbranch::@ | @::nextbranch | downstream(@, branchesandheads)" +push-bookmark-prefix = "thermokarst/jj-" [revset-aliases] -'bases' = 'main' -'downstream(x,y)' = '(x::y) & y' -'branches' = 'downstream(trunk(), branches()) & mine()' -'branchesandheads' = 'branches | (heads(trunk()::) & mine())' -'curbranch' = 'latest(branches::@- & branches)' -'nextbranch' = 'roots(@:: & branchesandheads)' -'stack' = 'bases..@' +'stack()' = 'main..@' [ui] default-command = ["log"]