Git fu

Commit all but your latest (assuming upstream remote is called origin and your branch is bleeding-jumbo):

$ git push origin HEAD^:bleeding-jumbo

To avoid local merges (see http://aaronbonner.io/post/78444674979/only-allow-git-fast-forward-merges-to-avoid-ugly and this discussion):

$ git config --global merge.ff only

BTW you can show any commit with (most) WS changes muted, using eg.

git show -w e137572