[git] Enable fast-forward merges again

Disabling makes `git pull` useless…
[emacs] Update Stante Pede and Cask