diff options
| author | Mike McQuaid | 2015-07-09 23:50:55 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-07-09 23:50:55 +0100 |
| commit | 151890148c5fa5310058863db67d6b558930b69f (patch) | |
| tree | 0a61db8daa9efd49a8b56be95deee63334571b65 /Library/Homebrew | |
| parent | 0b740f51abcd9ae2704e10d74d62d839ea9a8ff0 (diff) | |
| download | brew-151890148c5fa5310058863db67d6b558930b69f.tar.bz2 | |
update: fix --rebase
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/update.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 37610956a..ba03d34a4 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -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 } |