diff options
| author | Mike McQuaid | 2017-01-30 10:15:06 +0000 |
|---|---|---|
| committer | GitHub | 2017-01-30 10:15:06 +0000 |
| commit | 664d0c67d5947605c914c4c56ebcfaa80cb6eca0 (patch) | |
| tree | b2ad3aeb992b7176c47ad7d785bacb237008bed8 | |
| parent | 6f4cf7bdd62ded02248104b08711cb25d5761d16 (diff) | |
| parent | 276d8805ca30c2c08c58a7b9032f94902b52f1fa (diff) | |
| download | brew-664d0c67d5947605c914c4c56ebcfaa80cb6eca0.tar.bz2 | |
Merge pull request #1931 from MikeMcQuaid/update-performs-migrations1.1.9
update: note migrations may be performed.
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 2 | ||||
| -rw-r--r-- | docs/brew.1.html | 2 | ||||
| -rw-r--r-- | manpages/brew.1 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 678622230..c5e618403 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -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`). diff --git a/docs/brew.1.html b/docs/brew.1.html index 2e036eb55..65d669427 100644 --- a/docs/brew.1.html +++ b/docs/brew.1.html @@ -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> diff --git a/manpages/brew.1 b/manpages/brew.1 index f122337fb..560d6da14 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -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)\. |