robb/.dotfiles — pull request #9 by stigi (2012-07-09 12:30:21+00:00)
Title: Disabling Fast-Forward as a default for merges

- adding `merff` alias to counciously ff
- adding `--ff` to the `puff` alias to make it work with the new default