Use -r with less not -R to allow better unicode support
Set GIT_EDITOR to nano [vi is not for dummies]
Alias vim to vi