linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 21:39:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Marc Cornellà 2019-04-09 18:33:15 +02:00 committed by GitHub
commit 35dc26a2c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/git/git.plugin.zsh
View file

@ -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'