summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
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.