aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
Commit message (Expand)AuthorAgeFilesLines
* contrib: Allow use of github API authentication in github-mergeWladimir J. van der Laan2019-01-141-2/+6
* contrib: Add support for http[s] URLs in github-mergeWladimir J. van der Laan2019-01-141-1/+4
* contrib: Detailed reporting for http errors in github-mergeWladimir J. van der Laan2019-01-141-0/+6
* Remove Python 2 import workaroundspracticalswift2018-12-131-5/+1
* Handle exception as ImportErrorDaniel Ingram2018-12-091-1/+1
* Explicitly specify encoding when opening text files in Python codepracticalswift2018-06-121-1/+1
* Minor Python cleanups to make flake8 pass with the new rules enabledpracticalswift2018-04-161-1/+2
* Remove assigned but never used local variablespracticalswift2018-03-291-9/+9
* github-merge: Coalesce git fetchesWladimir J. van der Laan2017-09-051-7/+3
* Use print(...) instead of undefined printf(...)practicalswift2017-08-281-2/+2
* Use sys.exit(...) instead of exit(...): exit(...) should not be used in programspracticalswift2017-08-281-18/+19
* Add PR description to merge commit in github-merge.pyPieter Wuille2017-07-101-0/+2
* devtools: Retry after signing fails in github-mergeWladimir J. van der Laan2017-05-311-2/+1
* Remove unused Python importspracticalswift2017-05-021-1/+1
* contrib: github-merge improvementsWladimir J. van der Laan2017-04-211-29/+26
* devtools: Make github-merge compute SHA512 from git, instead of worktreeWladimir J. van der Laan2017-03-131-8/+37
* devtools: Fix a syntax error typoWladimir J. van der Laan2017-03-071-1/+1
* Merge #9880: Verify Tree-SHA512s in merge commits, enforce sigs are not SHA1Wladimir J. van der Laan2017-03-061-0/+14
|\
| * Fail merge if there are any symlinksMatt Corallo2017-03-011-0/+14
* | [contrib] gh-merge: Move second sha512 check to before signingMarcoFalke2017-03-031-4/+5
|/
* Add SHA512 tree hash to merge commitsPieter Wuille2017-02-261-3/+43
* Remove unused Python importspracticalswift2017-01-131-1/+1
* [copyright] copyright header style uniformisle29832016-11-061-1/+1
* devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan2016-04-021-12/+22
* devtools: make github-merge.py use py3Wladimir J. van der Laan2016-03-231-7/+13
* devtools: Fix utf-8 support in messages for github-mergeWladimir J. van der Laan2016-01-271-3/+3
* Merge #7402: [devtools] github-merge get toplevel dir without extra whitespaceWladimir J. van der Laan2016-01-251-1/+1
|\
| * [devtools] github-merge get toplevel dir without extra whitespaceAndrew C2016-01-251-1/+1
* | devtools: show pull and commit information in github-mergeWladimir J. van der Laan2016-01-221-0/+12
|/
* devtools: replace github-merge with python versionWladimir J. van der Laan2016-01-201-0/+223
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-20 14:26:10 +0000