Disabling git fast forward merge

[luciano]

Hi Mosh, from the branching section one of yours git commands was wrong, instead of:

git config ff no

the correct would be:

git config merge.ff no