git: improve reflog format
git: use diff3 merge markers
git: reduce diff.context to 5
git: add mb = merge-base alias