diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index 791d76c..900037a 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -25,8 +25,11 @@ in { aliases.".." = [ "edit" "@-" ]; aliases.",," = [ "edit" "@+" ]; - aliases.pull = [ "git" "fetch" ]; + aliases.fetch = [ "git" "fetch" ]; + aliases.f = [ "git" "fetch" ]; + aliases.push = [ "git" "push" ]; + aliases.p = [ "git" "push" ]; aliases.clone = [ "git" "clone" "--colocate" ]; aliases.cl = [ "git" "clone" "--colocate" ]; @@ -34,16 +37,19 @@ in { aliases.init = [ "git" "init" "--colocate" ]; aliases.i = [ "git" "init" "--colocate" ]; - aliases.c = "commit"; + aliases.c = [ "commit" ]; aliases.ci = [ "commit" "--interactive" ]; - aliases.e = "edit"; - aliases.r = "rebase"; + aliases.e = [ "edit" ]; + aliases.r = [ "rebase" ]; - aliases.s = "squash"; + aliases.s = [ "squash" ]; aliases.si = [ "squash" "--interactive" ]; - aliases.tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"]; + aliases.d = [ "diff" ]; + aliases.l = [ "log" ]; + + aliases.tug = [ "bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-" ]; revset-aliases."closest_bookmark(to)" = "heads(::to & bookmarks())";