Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
1bd72f58
Unverified
Commit
1bd72f58
authored
Apr 09, 2019
by
Marc Cornellà
Committed by
GitHub
Apr 09, 2019
Browse files
Update to inline conditional syntax
parent
308b0468
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/git/git.plugin.zsh
View file @
1bd72f58
...
@@ -33,11 +33,6 @@ function work_in_progress() {
...
@@ -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'
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment