<p>What are the best file permission settings for PHP scripts? Any suggestions on ways to figure out the minimum required permissions?</p>

This is very similar to a question I asked about
how to get changes on a branch in git
. Note that the behaviour of git diff vs. git log is inconsistently different when using two dots vs. three dots. But, for your application you can use:
```
```
git fetch
git diff ...origin
```
```
After that, a
```
git pull
```
will merge the changes into your HEAD.