From 42c6efb0a378f93eb71c9eced81f8e42abae64a5 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Sat, 13 Jan 2024 21:58:23 -0600 Subject: [PATCH] tweak some git aliases so they work (#734) There were some aliases that weren't working correctly, so I tried to fix them. --- aliases/git/git-aliases.nu | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/aliases/git/git-aliases.nu b/aliases/git/git-aliases.nu index a90093a..1e612bc 100644 --- a/aliases/git/git-aliases.nu +++ b/aliases/git/git-aliases.nu @@ -1,8 +1,8 @@ -def git_current_branch [] { +export def git_current_branch [] { (gstat).branch } -def git_main_branch [] { +export def git_main_branch [] { git remote show origin | lines | str trim @@ -102,13 +102,13 @@ export alias glgg = git log --graph export alias glgga = git log --graph --decorate --all export alias glgm = git log --graph --max-count=10 export alias glo = git log --oneline --decorate -export alias glod = git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' -export alias glods = git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short +export alias glod = git log --graph --pretty='%Cred%h%Creset -%C(char lp)auto(char rp)%d%Creset %s %Cgreen(char lp)%ad(char rp) %C(char lp)bold blue(char rp)<%an>%Creset' +export alias glods = git log --graph --pretty='%Cred%h%Creset -%C(char lp)auto(char rp)%d%Creset %s %Cgreen(char lp)%ad(char rp) %C(char lp)bold blue(char rp)<%an>%Creset' --date=short export alias glog = git log --oneline --decorate --graph export alias gloga = git log --oneline --decorate --graph --all -export alias glol = git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' -export alias glola = git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all -export alias glols = git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat +export alias glol = git log --graph --pretty='%Cred%h%Creset -%C(char lp)auto(char rp)%d%Creset %s %Cgreen(char lp)%ar(char rp) %C(char lp)bold blue(char rp)<%an>%Creset' +export alias glola = git log --graph --pretty='%Cred%h%Creset -%C(char lp)auto(char rp)%d%Creset %s %Cgreen(char lp)%ar(char rp) %C(char lp)bold blue(char rp)<%an>%Creset' --all +export alias glols = git log --graph --pretty='%Cred%h%Creset -%C(char lp)auto(char rp)%d%Creset %s %Cgreen(char lp)%ar(char rp) %C(char lp)bold blue(char rp)<%an>%Creset' --stat export alias gm = git merge export alias gmtl = git mergetool --no-prompt