minor tweak to git hooks

- fix PREVIOUS_HEAD when run as git-merge
- catch fab css failure
Merge pull request #6206 from minrk/git-hooks

minor tweak to git hooks