diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 5e534078d4a69285469117a15ced8681ba9de076..f2c3799abae04976249bb6c22d2a739df56d17e9 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -23,6 +23,14 @@ module Homebrew
 
     Homebrew.perform_preinstall_checks
 
+    if ARGV.include?("--all")
+      opoo <<-EOS.undent
+        We decided to not change the behaviour of `brew upgrade` so
+        `brew upgrade --all` is equivalent to `brew upgrade` without any other
+        arguments (so the `--all` is a no-op and can be removed).
+      EOS
+    end
+
     if ARGV.named.empty?
       outdated = Formula.installed.select do |f|
         f.outdated?(fetch_head: ARGV.fetch_head?)