admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Allow brew update --rebase

Browse Source
This commit is contained in:
Max Howell 2011-09-20 02:25:50 +01:00
parent 2be915db99
commit e26797f471
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Contributions/manpages/brew.1.md
View File

@ -231,8 +231,11 @@ For the full command list, see the COMMANDS section.
Unsymlink <formula> from the Homebrew prefix. This can be useful for Unsymlink <formula> from the Homebrew prefix. This can be useful for
temporarily disabling a formula: `brew unlink foo && commands && brew link foo`. temporarily disabling a formula: `brew unlink foo && commands && brew link foo`.
* `update`: * `update [--rebase]`:
Fetch the newest version of Homebrew from GitHub using `git`(1). 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` [<formulae>]: * `upgrade` [<formulae>]:
Upgrade outdated brews. Upgrade outdated brews.

5
Library/Homebrew/cmd/update.rb
View File

@ -49,8 +49,11 @@ class RefreshBrew
raise raise
end end
end end
# specify a refspec so that 'origin/master' gets updated # 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 @current_revision = read_revision
end end

7
share/man/man1/brew.1
View File

@ -256,8 +256,11 @@ Example: \fBbrew install jruby && brew test jruby\fR
Unsymlink \fIformula\fR from the Homebrew prefix\. This can be useful for temporarily disabling a formula: \fBbrew unlink foo && commands && brew link foo\fR\. Unsymlink \fIformula\fR from the Homebrew prefix\. This can be useful for temporarily disabling a formula: \fBbrew unlink foo && commands && brew link foo\fR\.
. .
.TP .TP
\fBupdate\fR \fBupdate [\-\-rebase]\fR
Fetch the newest version of Homebrew from GitHub using \fBgit\fR(1)\. Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1)\.
.
.IP
If \-\-rebase is specified then \fBgit pull \-\-rebase\fR is used\.
. .
.TP .TP
\fBupgrade\fR [\fIformulae\fR] \fBupgrade\fR [\fIformulae\fR]