skippy@debian:~/code/habari$ cd php/
skippy@debian:~/code/habari/php$ ls
health_check.php  index.php
skippy@debian:~/code/habari/php$ git remote add habari -m master git://github.com/habari/habari.git .
skippy@debian:~/code/habari/php$ git pull -s recursive -X theirs habari masterFrom git://github.com/habari/habari
 * branch            master     -> FETCH_HEAD
Already up-to-date.
skippy@debian:~/code/habari/php$ ls
health_check.php  index.php