Merge 445381b into fbb341e

yeoman · Jul 3, 2019 · 0857958 · 0857958
2 parents fbb341e + 445381b
commit 0857958
Show file tree

Hide file tree

Showing 8 changed files with 274 additions and 271 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -125,7 +125,7 @@ function init() {
   });
 
   // Lookup for every namespaces, within the environments.paths and lookups
-  env.lookup(() => {
+  env.lookup(firstCmd.opts.localOnly || false, () => {
     const generatorList = createGeneratorList(env);
 
     // List generators

diff --git a/lib/usage.txt b/lib/usage.txt
@@ -6,7 +6,8 @@ General options:
   --version      # Print version
   --no-color     # Disable colors
   --[no-]insight # Toggle anonymous tracking
-  --generators	 # Print available generators
+  --generators   # Print available generators
+  --local-only   # Disable lookup of globally-installed generators
 
 Install a generator:
 
@@ -16,7 +17,7 @@ Install a generator:
   $ yo angular --help
 
 Run local generators:
-  
+
   Additionally, you can also run local generators without installing via npm.
 
   $ yo ./path/to/some/generator