summaryrefslogtreecommitdiff
path: root/lib/bundler/cli.rb
diff options
context:
space:
mode:
authorMichael Siegfried <michaeldsiegfried@gmail.com>2022-12-16 09:20:55 -0800
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-12-20 13:15:02 +0900
commitbeef72965e8d3e23bfc37a6da553d171357ec7f3 (patch)
tree4b1f1ca57740051dcc103c59853a0740565cb744 /lib/bundler/cli.rb
parent32e72b78b31a80d308f9762913399d179ed96914 (diff)
[rubygems/rubygems] Clarify flag description
Prerelease versions are already considered in a certain circumstance, and the 'if updating' is redundant in the update case anyway. https://github.com/rubygems/rubygems/commit/8d68635f8c
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6966
Diffstat (limited to 'lib/bundler/cli.rb')
-rw-r--r--lib/bundler/cli.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 28f5cd4c1e..3395e74556 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -293,7 +293,7 @@ module Bundler
method_option "major", :type => :boolean, :banner =>
"Prefer updating to next major version (default)"
method_option "pre", :type => :boolean, :banner =>
- "If updating, allow consideration of prerelease gems"
+ "Always choose the highest allowed version when updating gems, regardless of prerelease status"
method_option "strict", :type => :boolean, :banner =>
"Do not allow any gem to be updated past latest --patch | --minor | --major"
method_option "conservative", :type => :boolean, :banner =>
@@ -671,7 +671,7 @@ module Bundler
method_option "major", :type => :boolean, :banner =>
"If updating, prefer updating to next major version (default)"
method_option "pre", :type => :boolean, :banner =>
- "If updating, allow consideration of prerelease gems"
+ "If updating, always choose the highest allowed version, regardless of prerelease status"
method_option "strict", :type => :boolean, :banner =>
"If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
method_option "conservative", :type => :boolean, :banner =>