Skip to content

Commit

Permalink
Merge pull request #1931 from MikeMcQuaid/update-performs-migrations
Browse files Browse the repository at this point in the history
update: note migrations may be performed.
  • Loading branch information
MikeMcQuaid committed Jan 30, 2017
2 parents 6f4cf7b + 276d880 commit 664d0c6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Library/Homebrew/cmd/update.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#: * `update` [`--merge`] [`--force`]:
#: Fetch the newest version of Homebrew and all formulae from GitHub using
#: `git`(1).
#: `git`(1) and perform any necessary migrations.
#:
#: If `--merge` is specified then `git merge` is used to include updates
#: (rather than `git rebase`).
Expand Down
2 changes: 1 addition & 1 deletion docs/brew.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ <h2 id="COMMANDS">COMMANDS</h2>
<code>pin</code>.</p></dd>
<dt><code>untap</code> <var>tap</var></dt><dd><p>Remove a tapped repository.</p></dd>
<dt><code>update</code> [<code>--merge</code>] [<code>--force</code>]</dt><dd><p>Fetch the newest version of Homebrew and all formulae from GitHub using
<code>git</code>(1).</p>
<code>git</code>(1) and perform any necessary migrations.</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>
Expand Down
2 changes: 1 addition & 1 deletion manpages/brew.1
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ Remove a tapped repository\.
.
.TP
\fBupdate\fR [\fB\-\-merge\fR] [\fB\-\-force\fR]
Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1)\.
Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1) and perform any necessary migrations\.
.
.IP
If \fB\-\-merge\fR is specified then \fBgit merge\fR is used to include updates (rather than \fBgit rebase\fR)\.
Expand Down

0 comments on commit 664d0c6

Please sign in to comment.