diff --git a/git/gitconfig b/git/gitconfig index 3cfd4bc..a184545 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -4,11 +4,6 @@ [pull] rebase = true -[log] - abbrevCommit = true -[format] - pretty = %C(auto)%h%C(reset)%C(auto)%d%C(reset) %s %C(green)- %an %C(blue)(%ar)%C(reset) - [core] pager = diff-so-fancy | less --tabs=4 --RAW-CONTROL-CHARS diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 7238581..f7ef264 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -70,3 +70,9 @@ alias e="$EDITOR" if [[ "$EDITOR" == *vim ]]; then alias es="e -S" fi + +# some amendments to Oh My Zsh's git plugin +# https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/git/git.plugin.zsh +alias glo="git log --decorate --abbrev-commit --date=relative --pretty='%C(auto)%h%C(reset)%C(auto)%d%C(reset) %s %C(green)- %an %C(blue)(%ad)%C(reset)'" +alias glog='glo --graph' +alias gloga='glog --all' diff --git a/zsh/zshrc b/zsh/zshrc index 9747d4d..b9ec0b2 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -33,7 +33,7 @@ autoload -U colors && colors _perf_timer_start "total" -for script in functions options path env aliases plugins completion zle prompt colorscheme; do +for script in functions options path env plugins aliases completion zle prompt colorscheme; do _perf_timer_start "$script.zsh" source "$ZSH_DOTFILES/$script.zsh" _perf_timer_stop "$script.zsh"