Join untracked files to root .gitignore

diff --git a/.gitignore b/.gitignore
index f3f79b2ea1f603581eeece5f63dd438e7e6f42db..1499729868a1d51f1513b8820437ae09d3ea5254 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -141,6 +141,7 @@ ext/mbstring/libmbfl/filters/Makefile.in
 ext/mbstring/libmbfl/mbfl/Makefile.in
 ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
 ext/mbstring/libmbfl/nls/Makefile.in
+ext/mbstring/oniguruma/oniguruma.h
 ext/mssql/#*#
 ext/mssql/Makefile.global
 ext/mssql/acinclude.m4
@@ -188,9 +189,15 @@ sapi/fpm/php-fpm.1
 sapi/fpm/init.d.php-fpm
 sapi/fpm/php-fpm.conf
 sapi/fpm/fpm/php-cgi
+sapi/fpm/php-fpm.8
+sapi/fpm/php-fpm.service
+sapi/fpm/status.html
+sapi/fpm/www.conf
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
+sapi/phpdbg/build
+sapi/phpdbg/*.output
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1
@@ -231,4 +238,3 @@ win32/wsyslog.h
 # special cases to invert previous ignore rules
 !ext/fileinfo/libmagic.patch
 !ext/mbstring/oniguruma.patch
-

diff --git a/ext/mbstring/.gitignore b/ext/mbstring/.gitignore
deleted file mode 100644 (file)
index 21450cd..0000000
--- a/ext/mbstring/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-oniguruma/oniguruma.h

diff --git a/sapi/fpm/.gitignore b/sapi/fpm/.gitignore
deleted file mode 100644 (file)
index 3f8c091..0000000
--- a/sapi/fpm/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-php-fpm.8
-php-fpm.service
-status.html
-www.conf

diff --git a/sapi/phpdbg/.gitignore b/sapi/phpdbg/.gitignore
deleted file mode 100644 (file)
index 51165da..0000000
--- a/sapi/phpdbg/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.libs/
-phpdbg
-*.lo
-*.o
-*.output
-build