reorganize and (mostly) re-indent
add 'git log' alias
sort aliases alphabetically