diff options
author | Yasuo Ohgaki <yohgaki@php.net> | 2016-08-11 08:09:05 +0900 |
---|---|---|
committer | Yasuo Ohgaki <yohgaki@php.net> | 2016-08-11 08:09:05 +0900 |
commit | 5bf14e46993b3aa46af773760ab681672c73d8af (patch) | |
tree | 087cd2cae165aa1bde18da980e06bfa18aff6e1f | |
parent | bb955ec9372b7abe1d68def3acd80b41870f0af3 (diff) | |
parent | a38bc7b373c85fc4413a0f194180a24ada58850d (diff) | |
download | php-git-5bf14e46993b3aa46af773760ab681672c73d8af.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Support "git worktree"
-rwxr-xr-x | vcsclean | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #! /bin/sh -if test -d '.git'; then +if test -d '.git' -o -f '.git'; then ${MAKE:-make} -f build/build.mk gitclean-work else echo "Can't figure out your VCS, not cleaning." |