git: allow ff, prevent only on master
git: add note about no-ff for homebrew