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

Merge pull request #1931 from MikeMcQuaid/update-performs-migrations

Browse Source 
update: note migrations may be performed.
This commit is contained in:
Mike McQuaid 2017-01-30 10:15:06 +00:00 committed by GitHub
commit 664d0c67d5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/update.sh
View File

@ -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`).

2
docs/brew.1.html
View File

@ -398,7 +398,7 @@ source. This is useful for creating patches for the software.</p></dd>
<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>

2
manpages/brew.1
View File

@ -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)\.