diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2015-09-18 14:41:44 -0700 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2015-09-20 10:15:03 -0700 |
commit | 57c44324c19119de7c4bb714eae955654bbcc324 (patch) | |
tree | d4b23205f2f269f8e0d16822c2462c58bef7b34d /deps/npm/doc | |
parent | 61d48b45b5bf49e618afe9b933716af41476ad37 (diff) | |
download | node-new-57c44324c19119de7c4bb714eae955654bbcc324.tar.gz |
deps: upgrade to npm 2.14.4
PR-URL: https://github.com/nodejs/node/pull/2958
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/doc')
-rw-r--r-- | deps/npm/doc/files/package.json.md | 8 | ||||
-rw-r--r-- | deps/npm/doc/misc/npm-developers.md | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 3942670878..91064b58b9 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -178,10 +178,10 @@ The "files" field is an array of files to include in your project. If you name a folder in the array, then it will also include the files inside that folder. (Unless they would be ignored by another rule.) -You can also provide a ".npmignore" file in the root of your package, -which will keep files from being included, even if they would be picked -up by the files array. The ".npmignore" file works just like a -".gitignore". +You can also provide a ".npmignore" file in the root of your package or +in subdirectories, which will keep files from being included, even +if they would be picked up by the files array. The `.npmignore` file +works just like a `.gitignore`. Certain files are always included, regardless of settings: diff --git a/deps/npm/doc/misc/npm-developers.md b/deps/npm/doc/misc/npm-developers.md index 75474f956a..2ef900b349 100644 --- a/deps/npm/doc/misc/npm-developers.md +++ b/deps/npm/doc/misc/npm-developers.md @@ -100,7 +100,9 @@ Use a `.npmignore` file to keep stuff out of your package. If there's no `.npmignore` file, but there *is* a `.gitignore` file, then npm will ignore the stuff matched by the `.gitignore` file. If you *want* to include something that is excluded by your `.gitignore` file, you can -create an empty `.npmignore` file to override it. +create an empty `.npmignore` file to override it. Like `git`, `npm` looks +for `.npmignore` and `.gitignore` files in all subdirectories of your +package, not only the root directory. `.npmignore` files follow the [same pattern rules](http://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files) as `.gitignore` files: |