zsh: gpg forward socket must be same user

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 2b901fa5c6e8a5e5d607d4ad669756bbcbec604a..0b72a56cbcb47ac93af4114a4d12479286a22a8a 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -291,6 +291,7 @@ alias svu="sudo python3 -mvenv --upgrade"
 alias g=git
 alias gd='git diff'
 alias gdh='git diff HEAD'
+alias gdp='git diff HEAD\^'
 alias gds='git diff --staged'
 alias ga='git add'
 alias ga.='git add .'
@@ -303,9 +304,12 @@ alias gu='git pull'
 alias gl='git log'
 alias gt='git tree' # from gitconfig
 alias gsh='git show'
+alias gshn='git show --name-status'
 alias gst='git status'
+alias gsts='git status --short'
 alias gs='git stash'
 alias gsp='git stash pop'
+alias grc='git rebase --continue'
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
@@ -315,6 +319,7 @@ if [[ -v commands[zoxide] ]] {
     # https://github.com/ajeetdsouza/zoxide/issues/513
     eval "${$(zoxide init zsh):s#_files -/#_cd#}"
     alias cd=z
+    alias z-='z -'
 }
 alias cd..=up
 ## dotfiles