remove simple push from git, add aliases

On newer versions it's already the default, and on older versions it crashes. I don't do complex merging anyway.