Today's git-fu: splitting a big commit into several well-defined commits: https://stackoverflow.com/a/6217314/509706 (the time-honoured technique of SO docs)