Made git aliases more idiot proof after reading a post on the subject

The post: http://notes.envato.com/developers/rebasing-merge-commits-in-git/