update some mappings
update git diff aliases