diff --git a/dot_config/jj/config.toml b/dot_config/jj/config.toml index 79e1f4e..f3d365d 100644 --- a/dot_config/jj/config.toml +++ b/dot_config/jj/config.toml @@ -5,14 +5,14 @@ email = "me@barakmich.com" [ui] editor = "nvim" #default-command = ["log", "--reversed"] -default-command = ["util", "exec", "--", "bash", "-c", "jj log --reversed && jj diff -s"] +default-command = ["util", "exec", "--", "bash", "-c", "jj log --reversed --no-pager && jj diff -s"] diff.format = "git" [revset-aliases] -'nearby(x)' = 'descendants(ancestors(@, x))' +'nearby(x)' = 'descendants(ancestors(@, x))::' [revsets] -log = "nearby(10) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ bookmarks()" +log = "nearby(8) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ bookmarks()" [colors] @@ -22,6 +22,8 @@ log = "nearby(10) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ bo push-bookmark-prefix = "barakmich/" [alias] -bm = ["bookmark", "move", "--to", "@-"] +bm = ["bookmark", "move", "--to"] +"bm." = ["bookmark", "move", "--to", "@"] pull = ["git", "fetch"] fetch = ["git", "fetch"] +push = ["git", "push"]