tool tools for php test use git 2016.10.23 git diff --staged or git diff --cached git reset HEAD git diff HEAD ?? git diff T how to use git merge