| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-02-20 | Revert "Make nicer pull request merge messages" | Wladimir J. van der Laan | |
| 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. | |||
| 2015-01-11 | Make nicer pull request merge messages | BtcDrak | |
| 2014-12-20 | contrib: make github-merge require signing | Wladimir J. van der Laan | |
| - Exit when there is no signing key configured - Exit when user does not want to sign off | |||
| 2014-12-09 | contrib: show pull # in prompt for github-merge script | Wladimir J. van der Laan | |
| 2014-10-07 | contrib: revert changes to github-merge.sh in #5038 | Wladimir J. van der Laan | |
| 2014-10-03 | Bugfix: Replace bashisms with standard sh in tests/tools | Luke Dashjr | |
| 2014-08-19 | Fix github-merge with git version 2.1.0 | Gavin 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-24 | contrib: add sipa's github-merge script | Wladimir J. van der Laan | |
 |
index : slackcoder/bitcoin | |
| Bitcoin Code integration/staging tree | Mirror |
| aboutsummaryrefslogtreecommitdiff |