Skip to content

O
oh-my-zsh
Unverified Commit 35dc26a2 authored by Marc Cornellà's avatar Marc Cornellà Committed by GitHub
Browse files
Options

git: use stash 'push' instead of the deprecated 'save' (#7486)

* Use stash 'push' or 'save' depending on Git version A utility function now parses the output of git --version and set the alias for git stash to 'git stash push' iff the current version of Git is 2.13 or greater; it falls back to 'git stash save' otherwise.
parents 4aa545ab 1bd72f58
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
plugins/git/git.plugin.zsh
View file @ 35dc26a2
...@@ -239,7 +239,12 @@ alias gsps='git show --pretty=short --show-signature' ...@@ -239,7 +239,12 @@ alias gsps='git show --pretty=short --show-signature'
alias gsr='git svn rebase' alias gsr='git svn rebase'
alias gss='git status -s' alias gss='git status -s'
alias gst='git status' alias gst='git status'
alias gsta='git stash save'
# use the default stash push on git 2.13 and newer
[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \
&& alias gsta='git stash push'
|| alias gsta='git stash save'
alias gstaa='git stash apply' alias gstaa='git stash apply'
alias gstc='git stash clear' alias gstc='git stash clear'
alias gstd='git stash drop' alias gstd='git stash drop'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment