From 521efeab78e6e9ead966103ebbf3670fe3fac38b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 10 Sep 2016 10:03:19 +0100 Subject: [PATCH] Merge Cask's gitignore with root one. This fixes the ignoring in libgit2 clients that don't read nested `.gitignore` files. --- .gitignore | 4 ++++ Library/Homebrew/cask/.gitignore | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 Library/Homebrew/cask/.gitignore diff --git a/.gitignore b/.gitignore index 39dd7a4837..4b42e327d1 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 73d2c55da8..0000000000 --- a/Library/Homebrew/cask/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# toplevel -/.bundle/ -/bin/ -/vendor/ - -# anywhere in the tree -*~ -.DS_Store -.ruby-version -coverage