diff --git a/dot_config/jj/config.toml b/dot_config/jj/config.toml index bb09745..86f3842 100644 --- a/dot_config/jj/config.toml +++ b/dot_config/jj/config.toml @@ -5,6 +5,7 @@ email = "me@barakmich.com" [ui] editor = "nvim" default-command = ["log", "--reversed"] +diff.format = "git" [revsets] log = "ancestors(@, 10) | @..main@origin | main@origin::@" @@ -14,3 +15,5 @@ push-bookmark-prefix = "barakmich/" [alias] bm = ["bookmark", "move", "--to", "@-"] +pull = ["git", "fetch"] +fetch = ["git", "fetch"]