summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-06-19 11:59:34 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-06-22 17:50:08 -0500
commit589eab292abd4952fb02815597d2ecf4e1d41fde (patch)
tree0ac3439554cb4617fb79666eb9e6d4e28d1c60ac /man
parent67ff76af19e6d033d26e63ff2f064754316fee38 (diff)
downloadbundler-589eab292abd4952fb02815597d2ecf4e1d41fde.tar.gz
Allow conflicts between bundler dependencies and the current bundler version
Diffstat (limited to 'man')
-rw-r--r--man/bundle-config.ronn3
1 files changed, 3 insertions, 0 deletions
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index c8a1391d3e..9fc62edae3 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -234,6 +234,9 @@ learn more about their operation in [bundle install(1)][bundle-install].
* `update_requires_all_flag` (`BUNDLE_UPDATE_REQUIRES_ALL_FLAG`)
Require passing `--all` to `bundle update` when everything should be updated,
and disallow passing no options to `bundle update`.
+* `allow_bundler_dependency_conflicts` (`BUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS`):
+ Allow resolving to specifications that have dependencies on `bundler` that
+ are incompatible with the running Bundler version.
In general, you should set these settings per-application by using the applicable
flag to the [bundle install(1)][bundle-install] or [bundle package(1)][bundle-package] command.