Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Git plugin] Use stash 'push' instead of the deprecated 'save' #7486

Merged
merged 2 commits into from
Apr 9, 2019
Merged

[Git plugin] Use stash 'push' instead of the deprecated 'save' #7486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308b046
Use stash 'push' or 'save' depending on Git version
Dec 30, 2018
1bd72f5
Update to inline conditional syntax
mcornella Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion plugins/git/git.plugin.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,12 @@ alias gsps='git show --pretty=short --show-signature'
alias gsr='git svn rebase'
alias gss='git status -s'
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 gstc='git stash clear'
alias gstd='git stash drop'
Expand Down