Skip to content
Snippets Groups Projects
Commit 15189014 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

update: fix --rebase

parent 0b740f51
No related branches found
No related tags found
No related merge requests found
......@@ -148,11 +148,12 @@ class Updater
# ensure we don't munge line endings on checkout
safe_system "git", "config", "core.autocrlf", "false"
args = ["pull", "origin"]
args = ["pull"]
args << "--rebase" if ARGV.include? "--rebase"
args += quiet
args << "origin"
# the refspec ensures that 'origin/master' gets updated
args << "refs/heads/master:refs/remotes/origin/master"
args += quiet
reset_on_interrupt { safe_system "git", *args }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment