diff options
| author | Mike McQuaid | 2016-09-10 15:39:31 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-10 15:39:31 +0100 |
| commit | 094bdf430d955522e4ad947aa9db963bf834d3be (patch) | |
| tree | 5340ee1b7eb07c60a57379b39ea01d8be913239f | |
| parent | 5b90b451f761cad26121fec013cdb2e77f31c57d (diff) | |
| parent | 521efeab78e6e9ead966103ebbf3670fe3fac38b (diff) | |
| download | brew-094bdf430d955522e4ad947aa9db963bf834d3be.tar.bz2 | |
Merge pull request #908 from MikeMcQuaid/merge-cask-gitignore
Merge Cask's gitignore with root one.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cask/.gitignore | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 39dd7a483..4b42e327d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,10 @@ # Ignore generated files within `Library` (again). /Library/Homebrew/doc +/Library/Homebrew/cask/.bundle +/Library/Homebrew/cask/bin +/Library/Homebrew/cask/vendor +/Library/Homebrew/cask/coverage /Library/Homebrew/test/.bundle /Library/Homebrew/test/bin /Library/Homebrew/test/vendor diff --git a/Library/Homebrew/cask/.gitignore b/Library/Homebrew/cask/.gitignore deleted file mode 100644 index 73d2c55da..000000000 --- a/Library/Homebrew/cask/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# toplevel -/.bundle/ -/bin/ -/vendor/ - -# anywhere in the tree -*~ -.DS_Store -.ruby-version -coverage |