aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
AgeCommit message (Expand)Author
2018-06-12Explicitly specify encoding when opening text files in Python codepracticalswift
2018-04-16Minor Python cleanups to make flake8 pass with the new rules enabledpracticalswift
2018-03-29Remove assigned but never used local variablespracticalswift
2017-09-05github-merge: Coalesce git fetchesWladimir J. van der Laan
2017-08-28Use print(...) instead of undefined printf(...)practicalswift
2017-08-28Use sys.exit(...) instead of exit(...): exit(...) should not be used in programspracticalswift
2017-07-10Add PR description to merge commit in github-merge.pyPieter Wuille
2017-05-31devtools: Retry after signing fails in github-mergeWladimir J. van der Laan
2017-05-02Remove unused Python importspracticalswift
2017-04-21contrib: github-merge improvementsWladimir J. van der Laan
2017-03-13devtools: Make github-merge compute SHA512 from git, instead of worktreeWladimir J. van der Laan
2017-03-07devtools: Fix a syntax error typoWladimir J. van der Laan
2017-03-06Merge #9880: Verify Tree-SHA512s in merge commits, enforce sigs are not SHA1Wladimir J. van der Laan
2017-03-03[contrib] gh-merge: Move second sha512 check to before signingMarcoFalke
2017-03-01Fail merge if there are any symlinksMatt Corallo
2017-02-26Add SHA512 tree hash to merge commitsPieter Wuille
2017-01-13Remove unused Python importspracticalswift
2016-11-06[copyright] copyright header style uniformisle2983
2016-04-02devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan
2016-03-23devtools: make github-merge.py use py3Wladimir J. van der Laan
2016-01-27devtools: Fix utf-8 support in messages for github-mergeWladimir J. van der Laan
2016-01-25Merge #7402: [devtools] github-merge get toplevel dir without extra whitespaceWladimir J. van der Laan
2016-01-25[devtools] github-merge get toplevel dir without extra whitespaceAndrew C
2016-01-22devtools: show pull and commit information in github-mergeWladimir J. van der Laan
2016-01-20devtools: replace github-merge with python versionWladimir J. van der Laan