aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorMike McQuaid2016-08-12 14:22:00 +0100
committerMike McQuaid2016-08-12 14:22:00 +0100
commit24fb0068e7933bec7e74a632fce3c4d3d05559c4 (patch)
tree9a85d198ecf8fde04968fe9d9592a50c4f933a46 /share
parent97a66aa513f515472b3c36256f4624060d5e365c (diff)
downloadbrew-24fb0068e7933bec7e74a632fce3c4d3d05559c4.tar.bz2
update: add --force argument.
Add a `brew update --force` to side-step all of the clever optimisations we have to detect if an update is unnecessary. That means if those optimisations go wrong in future we can tell people just to run this single command. This would have been a useful workaround for the issue fixed in 985c672.
Diffstat (limited to 'share')
-rw-r--r--share/doc/homebrew/brew.1.html4
-rw-r--r--share/man/man1/brew.12
2 files changed, 4 insertions, 2 deletions
diff --git a/share/doc/homebrew/brew.1.html b/share/doc/homebrew/brew.1.html
index e25222cd1..9e3df53b7 100644
--- a/share/doc/homebrew/brew.1.html
+++ b/share/doc/homebrew/brew.1.html
@@ -440,7 +440,9 @@ source. This is useful for creating patches for the software.</p></dd>
<code>git</code>(1).</p>
<p>If <code>--merge</code> is specified then <code>git merge</code> is used to include updates
- (rather than <code>git rebase</code>).</p></dd>
+ (rather than <code>git rebase</code>).
+If <code>--force</code> is specified then always do a slower, full update check even
+ if unnecessary.</p></dd>
<dt><code>upgrade</code> [<var>install-options</var>] [<code>--cleanup</code>] [<code>--fetch-HEAD</code>] [<var>formulae</var>]</dt><dd><p>Upgrade outdated, unpinned brews.</p>
<p>Options for the <code>install</code> command are also valid here.</p>
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 2b6a16380..b64676513 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -597,7 +597,7 @@ Remove a tapped repository\.
Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1)\.
.
.IP
-If \fB\-\-merge\fR is specified then \fBgit merge\fR is used to include updates (rather than \fBgit rebase\fR)\.
+If \fB\-\-merge\fR is specified then \fBgit merge\fR is used to include updates (rather than \fBgit rebase\fR)\. If \fB\-\-force\fR is specified then always do a slower, full update check even if unnecessary\.
.
.TP
\fBupgrade\fR [\fIinstall\-options\fR] [\fB\-\-cleanup\fR] [\fB\-\-fetch\-HEAD\fR] [\fIformulae\fR]