Fix github-merge with git version 2.1.0

Running git version 2.1.0 on OSX (homebrew), I get
  fatal: '1q': not a non-negative integer

I'm guessing git command-line parsing got more strict recently?
Merge pull request #4731

c53b1ec Fix github-merge with git version 2.1.0 (Gavin Andresen)