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

Update to inline conditional syntax

Browse source
This commit is contained in:
Marc Cornellà 2019-04-09 18:29:18 +02:00 committed by GitHub
parent 308b046875
commit 1bd72f588c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,11 +33,6 @@ function work_in_progress() {
fi fi
} }
function _omz_git_stash_command() {
[[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \
&& echo push || echo save
}
# #
# Aliases # Aliases
# (sorted alphabetically) # (sorted alphabetically)
@ -243,7 +238,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 $(_omz_git_stash_command)"
# 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'