aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* devtools: replace github-merge with python versionWladimir J. van der Laan2016-01-201-185/+0
| | | | | | | | This is meant to be a direct translation of the bash script, with the difference that it retrieves the PR title from github, thus creating pull messages like: Merge #12345: Expose transaction temperature over RPC
* devtools: don't push if signing fails in github-mergeWladimir J. van der Laan2015-09-181-1/+5
| | | | | If a problem happens with gpg, exit prematurely so that it doesn't push the branch upstream.
* Revert "Make nicer pull request merge messages"Wladimir J. van der Laan2015-02-201-4/+2
| | | | | | | | | | | This reverts commit 1078fb08851442bcd7750c3d5015dc1fe7e4d927 (and thus pull #5623). It has various issues: - Pull request names get cut off at ", see e.g. a026a56 - Merge script no longer copes with pulls that have a milestone attached, due to a duplicate 'title' in JSON that is not handled by the ad-hoc parsing.
* Make nicer pull request merge messagesBtcDrak2015-01-111-2/+4
|
* contrib: make github-merge require signingWladimir J. van der Laan2014-12-201-2/+7
| | | | | - Exit when there is no signing key configured - Exit when user does not want to sign off
* contrib: show pull # in prompt for github-merge scriptWladimir J. van der Laan2014-12-091-0/+3
|
* contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan2014-10-071-13/+13
|
* Bugfix: Replace bashisms with standard sh in tests/toolsLuke Dashjr2014-10-031-13/+13
|
* 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