From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 19 Nov 2015 16:21:10 +0000 (-0800)
Subject: Migrate modules/.gitignore into .gitignore
X-Git-Tag: emacs-25.0.90~736
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca3bc790a76dd91d7063d13ba41b77ebc8bd2cb8;p=emacs.git

Migrate modules/.gitignore into .gitignore

* .gitignore: Add former contents of modules/.gitignore.
* modules/.gitignore: Remove.
---

diff --git a/.gitignore b/.gitignore
index fda50e9df77..86e377eb0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
 !test/etags/Makefile
@@ -139,6 +140,7 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
 [0-9]*.core
 core
 core.*[0-9]
@@ -207,6 +209,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns
diff --git a/modules/.gitignore b/modules/.gitignore
deleted file mode 100644
index 33a872ef84a..00000000000
--- a/modules/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# built modules
-*.so
-
-# built DOCFILEs
-*.doc
-
-# include makefile for now
-!Makefile