Git: add aliases, try patience diff-algorithm