aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* Fix github-merge with git version 2.1.0Gavin Andresen2014-08-191-2/+2
| | | | | | | 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?
* contrib: add sipa's github-merge scriptWladimir J. van der Laan2013-11-241-0/+173