@erikmd's recommended Git configuration

gitconfig.md

Recommended Git configuration

Run these standard commands anytime you setup git on a new workstation.

Mandatory

git config --global user.name "Prénom Nom"
git config --global user.email "prenom.nom@example.com"

Recommended

git config --global push.default upstream
git config --global pull.rebase false  # merge by default, else "git pull -r"
git config --global core.editor emacs  # unless you prefer vim or so
git config --global color.ui auto
git config --global rebase.stat true
git config --global merge.log true
git config --global merge.conflictstyle diff3

Verification

git config --global -l