git: update config, aliases; add config.local

[dotfiles.git] / etc / zsh / .zshrc

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 90f487058bbbd7b57710f9af6cf18b9eb13c25c3..55e9c6e3984584a7180d003ae6e7f776741bb1bb 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -248,6 +248,7 @@ alias pa=$ps
 alias spa="sudo $ps"
 unset ps
 ## git
 alias spa="sudo $ps"
 unset ps
 ## git

+alias g=git

 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'
 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'


@@ -256,6 +257,8 @@ alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'

+alias gl='git log'
+alias gt='git tree' # from gitconfig

 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})


@@ -268,7 +271,12 @@ if [[ -v commands[zoxide] ]] {
 }
 alias cd..=up
 ## dotfiles
 }
 alias cd..=up
 ## dotfiles

-alias dfu='d=${$(echo -E - ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d git pull'
+alias dfu='d=${$(echo -E - ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d {
+  git pull &&
+  git submodules init &&
+  git submodules sync &&
+  git submodules update
+}'

 
 ### hooks
 autoload -Uz add-zsh-hook
 
 ### hooks
 autoload -Uz add-zsh-hook