com php-src: Join untracked files to root .gitignore: .gitignore ext/mbstring/.gitignore sapi/fpm/.gitignore sapi/phpdbg/.gitignore
| From: | Nikita Popov | Date: | Thu, 05 Oct 2017 10:36:47 +0000 |
| Subject: | com php-src: Join untracked files to root .gitignore: .gitignore ext/mbstring/.gitignore sapi/fpm/.gitignore sapi/phpdbg/.gitignore | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99636@lists.php.net to get a copy of this message | ||
Commit: 39ea632f7468e1001b15b9c43afc6aba9debdc9c
Author: Peter Kokot <peterkokot@gmail.com> Thu, 5 Oct 2017 02:24:11 +0200
Committer: Nikita Popov <nikita.ppv@gmail.com> Thu, 5 Oct 2017 12:36:47 +0200
Parents: cb2fdb08d6ed41e68c23139b072251e3357e0406
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39ea632f7468e1001b15b9c43afc6aba9debdc9c
Log:
Join untracked files to root .gitignore
Changed paths:
M .gitignore
D ext/mbstring/.gitignore
D sapi/fpm/.gitignore
D sapi/phpdbg/.gitignore
Diff:
diff --git a/.gitignore b/.gitignore
index f3f79b2..1499729 100644
--- 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
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
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
index 51165da..0000000
--- a/sapi/phpdbg/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.libs/
-phpdbg
-*.lo
-*.o
-*.output
-build