I have my own aliases for most of common git commands and combos. That solved it for me.