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/Contributions/manpages/brew.1.md | 7 +++++-- Library/Homebrew/cmd/update.rb | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Library') diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md index 5fc03ace8..1cc524472 100644 --- a/Library/Contributions/manpages/brew.1.md +++ b/Library/Contributions/manpages/brew.1.md @@ -231,8 +231,11 @@ For the full command list, see the COMMANDS section. Unsymlink from the Homebrew prefix. This can be useful for temporarily disabling a formula: `brew unlink foo && commands && brew link foo`. - * `update`: - Fetch the newest version of Homebrew from GitHub using `git`(1). + * `update [--rebase]`: + Fetch the newest version of Homebrew and all formulae from GitHub using + `git`(1). + + If --rebase is specified then `git pull --rebase` is used. * `upgrade` []: Upgrade outdated brews. 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