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
14b4f62e
Unverified
Commit
14b4f62e
authored
Feb 29, 2020
by
Marc Cornellà
Committed by
GitHub
Feb 29, 2020
Browse files
updater: fix --autostash argument. Works for git > 1.7.1
See
https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
parent
1689e9bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/upgrade.sh
View file @
14b4f62e
...
@@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
...
@@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
fi
fi
printf
"
${
BLUE
}
%s
${
NORMAL
}
\n
"
"Updating Oh My Zsh"
printf
"
${
BLUE
}
%s
${
NORMAL
}
\n
"
"Updating Oh My Zsh"
if
git
pull
--
rebase
--
auto
st
as
h
--stat
origin master
if
git
-c
rebase
.
auto
Stash
=
true
pull
--reb
as
e
--stat
origin master
then
then
printf
'%s'
"
$GREEN
"
printf
'%s'
"
$GREEN
"
printf
'%s\n'
' __ __ '
printf
'%s\n'
' __ __ '
...
...
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