Automatic rebase is bad for you.
git diff with --word-diff
More concise git status