Commit Graph

4 Commits

Author SHA1 Message Date
Wladimir J. van der Laan cd3269e38e
contrib: revert changes to github-merge.sh in #5038 2014-10-07 10:00:12 +02:00
Luke Dashjr 0b17964131 Bugfix: Replace bashisms with standard sh in tests/tools 2014-10-03 23:45:26 +00:00
Gavin Andresen c53b1ece1b
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?
2014-08-19 13:47:37 -04:00
Wladimir J. van der Laan e5adec35c6 contrib: add sipa's github-merge script 2013-11-24 12:44:31 +01:00