From dec4b73aa0f30fcc2a31fa87e6be5e31ec58cd5f Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Tue, 20 Sep 2011 02:25:50 +0100
Subject: Allow `brew update --rebase`

---
 Library/Homebrew/cmd/update.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index 773bf257d..1073ef1f0 100644
--- a/Library/Homebrew/cmd/update.rb
+++ b/Library/Homebrew/cmd/update.rb
@@ -49,8 +49,11 @@ class RefreshBrew
           raise
         end
       end
+
       # specify a refspec so that 'origin/master' gets updated
-      execute "git pull origin refs/heads/master:refs/remotes/origin/master"
+      refspec = "refs/heads/master:refs/remotes/origin/master"
+      rebase = "--rebase" if ARGV.include? "--rebase"
+      execute "git pull #{rebase} origin #{refspec}"
       @current_revision = read_revision
     end
 
-- 
cgit v1.2.3