aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.sh
AgeCommit message (Collapse)Author
2015-01-11Make nicer pull request merge messagesBtcDrak
2014-12-20contrib: make github-merge require signingWladimir J. van der Laan
- Exit when there is no signing key configured - Exit when user does not want to sign off
2014-12-09contrib: show pull # in prompt for github-merge scriptWladimir J. van der Laan
2014-10-07contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan
2014-10-03Bugfix: Replace bashisms with standard sh in tests/toolsLuke Dashjr
2014-08-19Fix github-merge with git version 2.1.0Gavin Andresen
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?
2013-11-24contrib: add sipa's github-merge scriptWladimir J. van der Laan