summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-11-30 11:42:35 -0800
committerGitHub <noreply@github.com>2017-11-30 11:42:35 -0800
commit7bdc3da686fd2e7fce5be1fcc7ef9f9273e7cbb0 (patch)
treefd6c020864cc3a4b8db36b4f7eac630849d18afc
parentf7914ef58311d4145d637f65bbd3e681c20372a7 (diff)
parent60b3c6d7f2cab9dcff5861e872ee42b82cd0426a (diff)
Merge pull request #1450 from cblecker/git-ignore
Automatic merge from submit-queue. Add basic gitignore Add a basic gitignore so that things like .DS_Store files don't get committed to the repo
-rw-r--r--.gitignore39
-rw-r--r--community/2017-events/12-contributor-summit/.DS_Storebin6148 -> 0 bytes
2 files changed, 39 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..5e438b15
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,39 @@
+# OSX leaves these everywhere on SMB shares
+._*
+
+# OSX trash
+.DS_Store
+
+# Eclipse files
+.classpath
+.project
+.settings/**
+
+# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
+.idea/
+*.iml
+
+# Vscode files
+.vscode
+
+# Emacs save files
+*~
+\#*\#
+.\#*
+
+# Vim-related files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+
+# JUnit test output from ginkgo e2e tests
+/junit*.xml
+
+# Mercurial files
+**/.hg
+**/.hg*
+
+# direnv .envrc files
+.envrc
diff --git a/community/2017-events/12-contributor-summit/.DS_Store b/community/2017-events/12-contributor-summit/.DS_Store
deleted file mode 100644
index 6e450106..00000000
--- a/community/2017-events/12-contributor-summit/.DS_Store
+++ /dev/null
Binary files differ