I use kate (KDE Advanced Text Editor) and there's a setting that removes trailing whitespace whenever you save a file. Works awesome.

You get auto-indent and at the same time don't have to worry about leftover whitespace everywhere when you 'git commit'. In fact, after accepting pull requests I'll often just open up the files in kate and doing a trivial edit + save to ensure there's no pointless whitespace.