master

分支 (291)

标签 (946)

管理

管理

master

PHP-7.3

PHP-7.2

PHP-5.6.40

PHP-5.6

PHP-7.1

PHP-7.1.26

PHP-7.3.1

PHP-7.2.14

PHP-5.6.39

PHP-7.0

PHP-7.1.25

PHP-7.2.13

PHP-7.0.33

PHP-7.3.0

PHP-7.1.24

PHP-7.2.12

PHP-7.1.23

PHP-7.2.11

PHP-5.6.38

php-5.6.40

php-7.1.26

php-7.3.1

php-7.2.14

php-7.2.14RC1

php-7.3.1RC1

php-5.6.39

php-7.1.25

php-7.2.13

php-7.0.33

php-7.3.0

php-7.1.25RC1

php-7.2.13RC1

php-7.3.0RC6

php-7.1.24

php-7.2.12

php-7.3.0RC5

php-7.1.24RC1

php-7.2.12RC1

php-7.3.0RC4

php-src
/
.gitattributes

# Replace $Id$ strings with 40-character hexadecimal blob object name.
/ext/mysqlnd/mysqlnd.h          ident
/ext/ext_skel.php               ident
/ext/phar/phar/pharcommand.inc  ident
/ext/dba/libinifile/inifile.c   ident
/ext/dba/libflatfile/flatfile.c ident
/ext/dba/libcdb/cdb_make.c      ident
/ext/dba/libcdb/cdb.c           ident
/run-tests.php                  ident

# A custom merge driver to avoid automatic merges. These are manually merged.
# See https://wiki.php.net/vcs/gitfaq
/NEWS                merge=NEWS
/UPGRADING           merge=NEWS
/UPGRADING.INTERNALS merge=NEWS

# Enable commit diffs for binary PHP test files. Some PHP test files include
# special characters, such as ASCII control characters. Git recognizes these as
# binary and wouldn't generate diffs.
*.phpt diff