From 276d8805ca30c2c08c58a7b9032f94902b52f1fa Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 29 Jan 2017 17:30:44 +0000 Subject: [PATCH] update: note migrations may be performed. As requested in https://github.com/Homebrew/homebrew-core/issues/9316. --- Library/Homebrew/cmd/update.sh | 2 +- docs/brew.1.html | 2 +- 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 678622230b955..c5e6184034844 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 2e036eb558f94..65d6694273b9f 100644 --- a/docs/brew.1.html +++ b/docs/brew.1.html @@ -398,7 +398,7 @@

COMMANDS

pin.

untap tap

Remove a tapped repository.

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/manpages/brew.1 b/manpages/brew.1 index f122337fbff1f..560d6da14ebe4 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)\.