ipython/ipython — pull request #1725 by minrk (2012-05-11 01:05:19+00:00)
Title: add --no-ff to git pull in test_pr

fast-forward could result in the subsequent `git commit` call failing due to nothing to commit.