Wrapping auto-expansion in an augroup
Side-by-side diff program
More informative git logs