9 commits

Author	SHA1	Message	Date
Wladimir J. van der Laan	3802ae7267	devtools: don't push if signing fails in github-merge ... If a problem happens with gpg, exit prematurely so that it doesn't push the branch upstream.	2015-09-18 06:03:17 +02:00
Wladimir J. van der Laan	aaba10f275	Revert "Make nicer pull request merge messages" ... This reverts commit 1078fb0885 (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.	2015-02-20 09:59:33 +01:00
BtcDrak	1078fb0885	Make nicer pull request merge messages	2015-01-11 09:12:40 +00:00
Wladimir J. van der Laan	39c809942d	contrib: make github-merge require signing ... - Exit when there is no signing key configured - Exit when user does not want to sign off	2014-12-20 13:58:51 +01:00
Wladimir J. van der Laan	6e6a36ce30	contrib: show pull # in prompt for github-merge script	2014-12-09 10:16:58 +01:00
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