'rule' usage comment added.
'ff' is much easier to type than 'f~' on a Mac keyboard
unused git aliases removed.
git config push.default=tracking is a deprecated synonym for upstream