diff options
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | man/bundle-config.ronn | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 79e4b0184a..f1e1bbcdf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Bugfixes: - stubs for gems with dev deps no longer cause exceptions (#2272) - don't suggest binstubs to --binstubs users +Documentation: + + - added note on overring variable and flag comptibility for `bundle config` + ## 1.3.0.pre.6 (22 January 2013) Features: diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn index c1dfb8bc27..96cf59bd0c 100644 --- a/man/bundle-config.ronn +++ b/man/bundle-config.ronn @@ -21,7 +21,8 @@ setting, and where it was set. Executing `bundle config <name> <value>` will set that configuration to the value specified for all bundles executed as the current user. The configuration -will be stored in `~/.bundle/config`. +will be stored in `~/.bundle/config`. If <name> already is set, <name> will be +overridden and user will be warned. Executing `bundle config --global <name> <value>` works the same as above. @@ -29,7 +30,7 @@ Executing `bundle config --local <name> <value>` will set that configuration to the local application. The configuration will be stored in `app/.bundle/config`. Executing `bundle config --delete <name>` will delete the configuration in both -local and global sources. +local and global sources. Not compatible with --global or --local flag. Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will cause it to ignore all configuration. |