Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
14b4f62e
Unverified
Commit
14b4f62e
authored
Feb 29, 2020
by
Marc Cornellà
Committed by
GitHub
Feb 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updater: fix --autostash argument. Works for git > 1.7.1
See
https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
parent
1689e9bb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
upgrade.sh
tools/upgrade.sh
+1
-1
No files found.
tools/upgrade.sh
View file @
14b4f62e
...
...
@@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
fi
printf
"
${
BLUE
}
%s
${
NORMAL
}
\n
"
"Updating Oh My Zsh"
if
git
pull
--rebase
--autostash
--stat
origin master
if
git
-c
rebase.autoStash
=
true
pull
--rebase
--stat
origin master
then
printf
'%s'
"
$GREEN
"
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