From cd3998ef7e4cb96dbaef795b585c4c00fb6a1aa3 Mon Sep 17 00:00:00 2001 From: Jes Olson Date: Thu, 17 Aug 2023 13:15:17 -0500 Subject: [PATCH] true up jj & git using aliases that are hardcoded in my brain --- .config/git/config | 4 ++-- .config/jj/config.toml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.config/git/config b/.config/git/config index 75a6e77..393714b 100644 --- a/.config/git/config +++ b/.config/git/config @@ -2,7 +2,7 @@ addIgnoredFile = false detachedhead = false [alias] - st = status + s = status d = diff p = pull --prune --rebase ds = diff --staged @@ -13,7 +13,7 @@ br = branch amend = commit --amend -m aa = add -A . - ci = commit + cm = commit -m lg = log --color --graph --pretty=format:'%Cgreen%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lgs = log --graph --pretty=format:'%Cgreen%h%Creset - %s %C(yellow)%d' --abbrev-commit empty = commit --allow-empty -m 'Trigger Build' diff --git a/.config/jj/config.toml b/.config/jj/config.toml index 49ce4c2..f231381 100644 --- a/.config/jj/config.toml +++ b/.config/jj/config.toml @@ -8,3 +8,8 @@ email = "j3s@c3f.net" [ui] default-command = 'log' + +[aliases] +s = ["status"] +d = ["diff"] +cm = ["commit", "-m"] -- 2.51.2