Comment by tych0

My life was also improved with some additional aliases in my git config:

[alias] dfif = diff idff = diff grpe = grep