diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..01fcf259a890
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+/.komodotools
+/mediawiki-1.19.komodoproject
+/nbproject
+/.project
+/.settings
+/wikia-trunk.komodoproject
+/Wikia (trunk).esproj
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 000000000000..d5aa51744e26
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+/man
diff --git a/docs/html/.gitignore b/docs/html/.gitignore
new file mode 100644
index 000000000000..c3d9db18bc2e
--- /dev/null
+++ b/docs/html/.gitignore
@@ -0,0 +1,16 @@
+/*.html
+/*.dot
+/*.md5
+/*.map
+/*.png
+/*.css
+/tab_b.gif
+/tab_r.gif
+/tab_l.gif
+/installdox
+/search.php
+/search.idx
+/media
+/MediaWiki
+/memcached-client
+/UtfNormal
diff --git a/extensions/FastStringSearch/.gitignore b/extensions/FastStringSearch/.gitignore
new file mode 100644
index 000000000000..55b51c6da723
--- /dev/null
+++ b/extensions/FastStringSearch/.gitignore
@@ -0,0 +1,3 @@
+/.deps
+/*.lo
+/*.la
diff --git a/extensions/OpenID/.gitignore b/extensions/OpenID/.gitignore
new file mode 100644
index 000000000000..3edc7660ef3c
--- /dev/null
+++ b/extensions/OpenID/.gitignore
@@ -0,0 +1,2 @@
+/_darcs
+/testopenid.sh
diff --git a/extensions/wikia/AdEngine/.gitignore b/extensions/wikia/AdEngine/.gitignore
new file mode 100644
index 000000000000..daf8d8044a7c
--- /dev/null
+++ b/extensions/wikia/AdEngine/.gitignore
@@ -0,0 +1 @@
+/AdEngine.php
diff --git a/extensions/wikia/FounderEmails/.gitignore b/extensions/wikia/FounderEmails/.gitignore
new file mode 100644
index 000000000000..1f3762377d8a
--- /dev/null
+++ b/extensions/wikia/FounderEmails/.gitignore
@@ -0,0 +1 @@
+/.FounderEmails.i18n.php.swp
diff --git a/extensions/wikia/NewWindowLinks/.gitignore b/extensions/wikia/NewWindowLinks/.gitignore
new file mode 100644
index 000000000000..c2717015798a
--- /dev/null
+++ b/extensions/wikia/NewWindowLinks/.gitignore
@@ -0,0 +1 @@
+/.NewWindowLinks.php.swp
diff --git a/extensions/wikia/RandomWiki/.gitignore b/extensions/wikia/RandomWiki/.gitignore
new file mode 100644
index 000000000000..89d5fc41df33
--- /dev/null
+++ b/extensions/wikia/RandomWiki/.gitignore
@@ -0,0 +1 @@
+/.SpecialRandomWiki.php.swp
diff --git a/extensions/wikia/hacks/VideoUploadPrototype/.gitignore b/extensions/wikia/hacks/VideoUploadPrototype/.gitignore
new file mode 100644
index 000000000000..6756b30b1f24
--- /dev/null
+++ b/extensions/wikia/hacks/VideoUploadPrototype/.gitignore
@@ -0,0 +1 @@
+/WikiaVideoFinal.mov
diff --git a/images/.gitignore b/images/.gitignore
new file mode 100644
index 000000000000..05cde256b061
--- /dev/null
+++ b/images/.gitignore
@@ -0,0 +1,9 @@
+/archive*
+/deleted*
+/math*
+/temp*
+/thumb*
+/timeline*
+/tmp*
+/temp*
+/?
diff --git a/includes/normal/.gitignore b/includes/normal/.gitignore
new file mode 100644
index 000000000000..2d25409163a6
--- /dev/null
+++ b/includes/normal/.gitignore
@@ -0,0 +1,10 @@
+/CompositionExclusions.txt
+/DerivedNormalizationProps.txt
+/NormalizationCorrections.txt
+/NormalizationTest.txt
+/testdata
+/UnicodeData.txt
+/UTF-8-test.txt
+/*~
+/._*
+/.DS_Store
diff --git a/languages/messages/wikia/.gitignore b/languages/messages/wikia/.gitignore
new file mode 100644
index 000000000000..d003445a3886
--- /dev/null
+++ b/languages/messages/wikia/.gitignore
@@ -0,0 +1 @@
+/.MessagesEn.php.swp
diff --git a/lib/simplehtmldom/.gitignore b/lib/simplehtmldom/.gitignore
new file mode 100644
index 000000000000..529d4905ffbe
--- /dev/null
+++ b/lib/simplehtmldom/.gitignore
@@ -0,0 +1 @@
+/.simple_html_dom.php.swp
diff --git a/serialized/.gitignore b/serialized/.gitignore
new file mode 100644
index 000000000000..2b31741ebe5f
--- /dev/null
+++ b/serialized/.gitignore
@@ -0,0 +1 @@
+/Messages*.ser
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 000000000000..581a22ab4451
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,10 @@
+/LocalTestSettings.php
+/*~
+/bin
+/build
+/.classpath
+/.project
+/project.index
+/phpunit_all.xml
+/phpunit.xml
+/config.xml