zshrc: more git aliases

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index ab3d7ef2ee738ed0c44099e614132b23f047a4fc..93208d85310d0255fc67a7f52e30f9d7c041792d 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -10,8 +10,9 @@ setopts=(
   ## 16.2.4  History
   # NOTE: NO_HIST_SAVE_BY_COPY to allow saving histfile if updating another
   #       user's histfile. this is for compatibility with zsu.
-  HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE HIST_LEX_WORDS
-  HIST_NO_STORE HIST_REDUCE_BLANKS NO_HIST_SAVE_BY_COPY SHARE_HISTORY
+  HIST_FCNTL_LOCK HIST_IGNORE_ALL_DUPS HIST_IGNORE_DUPS HIST_IGNORE_SPACE
+  HIST_LEX_WORDS HIST_NO_STORE HIST_REDUCE_BLANKS NO_HIST_SAVE_BY_COPY
+  HIST_SAVE_NO_DUPS SHARE_HISTORY
   ## 16.2.6  Input/Output
   NO_CLOBBER CLOBBER_EMPTY CORRECT_ALL INTERACTIVE_COMMENTS
   HASH_EXECUTABLES_ONLY
@@ -200,6 +201,20 @@ for k v (${(kv)a}) {
 }
 unset a k v
 
+## fzf
+# bash-style reverse-search-history (i.e. reverse-i-search)
+if [[ -v commands[fzf] ]] {
+    function _history-incremental-pattern-search-fzf {
+        l=(${(f)"$(fc -li -1 0 | fzf -e -m -n 1 +s --preview-window=hidden ${BUFFER:+-q $BUFFER})"})
+        l=$(for x ("${l[@]}") { echo ${${=x}:3}; })
+        BUFFER="$l"
+    }
+    zle -N _history-incremental-pattern-search-fzf
+    bindkey '^R' _history-incremental-pattern-search-fzf
+} else {
+    bindkey '^R' history-incremental-pattern-search-backward
+}
+
 ### aliases
 ## builtins
 alias rehash='_sev_setpath; rehash'
@@ -276,14 +291,25 @@ 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 .'
+alias gai='git add -i'
+alias gap='git add -p'
 alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
 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}})
@@ -401,5 +427,8 @@ esac
 autoload -Uz promptinit && promptinit
 prompt arrows
 
+### plugins
+load-plugins zshrc
+
 ### load site-specific
 load-site-dotfile zshrc