diff options
| author | Mike McQuaid | 2016-09-10 10:03:19 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-09-10 10:03:19 +0100 |
| commit | 521efeab78e6e9ead966103ebbf3670fe3fac38b (patch) | |
| tree | cdf7a14d73b22da52d91eaa78e2cd885e7eda392 | |
| parent | 4fb691e1759eab70801d58801ed28762e4519897 (diff) | |
| download | brew-521efeab78e6e9ead966103ebbf3670fe3fac38b.tar.bz2 | |
Merge Cask's gitignore with root one.
This fixes the ignoring in libgit2 clients that don't read nested
`.gitignore` files.
| -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 |