Is there a better way to review your own changes instead of "git diff"

Question

I normally do git status then git diff to review my changes before I commit. But when some changes are very big, git diff does not really show me the best format. So instead, I've got into a really bad habit of commit my work into github then checking my work in their gui (which is fantastic).

Only problem with this method is I then end up making 2 / 3 follow up commits to correct mistakes in the first commit which would not have been commited if I could somehow view the differences in a good format (like github, but offline).

What's the best way? I would prefer a command line option but appreciate that this will not match up to the view that github provides.

EDIT! I should add that I'm on MAC OSX, that probably makes a difference.

Answer 1

In case you haven't color config enabled

git config --global --add color.ui true