summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Arko <andre@arko.net>2014-03-04 08:57:59 -0800
committerAndré Arko <andre@arko.net>2014-03-04 08:57:59 -0800
commitdcf278f6c611846557112def175983f0cb0f6902 (patch)
tree874dd3583583e8e62118d05c14ba519be1837796
parent6a04e5b9b5a0ce75a2262ec60d3847f19e149de8 (diff)
parent0a814573363d48f8cd860d672f1c935fe1d89fca (diff)
downloadbundler-dcf278f6c611846557112def175983f0cb0f6902.tar.gz
Merge pull request #2917 from urbanautomaton/fix-bundle-config-documentation
Correct bundle-config manpage
-rw-r--r--man/bundle-config.ronn18
1 files changed, 12 insertions, 6 deletions
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index 08e02681a6..d6dfaf505c 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -86,12 +86,6 @@ learn more about their operation in [bundle install(1)][bundle-install].
* `bin` (`BUNDLE_BIN`):
Install executables from gems in the bundle to the specified directory.
Defaults to `false`.
-* `gemfile` (`BUNDLE_GEMFILE`):
- The name of the file that bundler should use as the `Gemfile`. This location
- of this file also sets the root of the project, which is used to resolve
- relative paths in the `Gemfile`, among other things. By default, bundler
- will search up from the current working directory until it finds a
- `Gemfile`.
* `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
Path to a designated CA certificate file or folder containing multiple
certificates for trusted CAs in PEM format.
@@ -106,6 +100,18 @@ You can set them globally either via environment variables or `bundle config`,
whichever is preferable for your setup. If you use both, environment variables
will take preference over global settings.
+An additional setting is available only as an environment variable:
+
+* `BUNDLE_GEMFILE`:
+ The name of the file that bundler should use as the `Gemfile`. This location
+ of this file also sets the root of the project, which is used to resolve
+ relative paths in the `Gemfile`, among other things. By default, bundler
+ will search up from the current working directory until it finds a
+ `Gemfile`.
+
+Bundler will ignore any `BUNDLE_GEMFILE` entries in local or global
+configuration files.
+
## LOCAL GIT REPOS
Bundler also allows you to work against a git repository locally