From 151890148c5fa5310058863db67d6b558930b69f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 9 Jul 2015 23:50:55 +0100
Subject: [PATCH] update: fix --rebase
---
Library/Homebrew/cmd/update.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index 37610956a3..ba03d34a4a 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 }
--
GitLab