3 Commits

Author	SHA1	Message	Date
Daniel Marjamäki	0c3a6b44f8	tools/pr.py: add --rebase=true to pull command and abort if there are conflicts	2019-04-15 06:59:28 +02:00
Daniel Marjamäki	60ce95c1ec	tools/pr.py: minor tweak	2018-11-20 06:36:08 +01:00
Daniel Marjamäki	399fef17ca	Add script pr.py to merge pull requests. runastyle is executed automatically.	2018-11-20 06:20:46 +01:00