bthirion/nipy — comment on commit 152f75429b903bd688b4bd0a23dc5c5b272baff4
File:  line 0
By matthew-brett:

If I remember, I like to squash these into the previous one with something like 'git rebase upstream/master --interactive' . It's a little fiddly but it makes for nice history.