X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/50816b00c5f65a05f9fa078ca636d46f3b0d5721..5052ea511bab91fcbc887f1d5057752e4f59d05a:/etc/zsh/.zshrc?ds=sidebyside diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc index 893cac5..93208d8 100644 --- 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 @@ -290,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 .' @@ -302,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}})