diff options
| author | Max Howell | 2011-09-20 02:25:50 +0100 |
|---|---|---|
| committer | Max Howell | 2011-09-20 02:30:31 +0100 |
| commit | dec4b73aa0f30fcc2a31fa87e6be5e31ec58cd5f (patch) | |
| tree | ff5b3436c4974c8c9451de2084e1a4ea21411cea /Library/Homebrew | |
| parent | 335383549eb8cca5b47100bd5e89213b597a1899 (diff) | |
| download | homebrew-dec4b73aa0f30fcc2a31fa87e6be5e31ec58cd5f.tar.bz2 | |
Allow `brew update --rebase`
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/update.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |