6 Commits

Author	SHA1	Message	Date
Anthony Bilinski	fe9d83d881	chore(tools): allow merging PR to whatever branch is checked out ... Useful for either dev testing or merging PRs to dev branches. Also stop updating local repo state beyond merging the PR.	2019-10-09 23:16:33 -07:00
Zetok Zalbavar	8f37d4c7ab	chore: delete leftover branches from previous testing with test script	2016-10-06 19:23:26 +01:00
initramfs	b7aa982a57	chore: rewrite all links to the qTox repository from tux3 to qTox	2016-08-04 06:25:50 +08:00
Zetok Zalbavar	2a420b85ef	chore(test-pr.sh): commit merge as qTox testing <> ... With this one doesn't need to even have git properly configured to test a PR.	2016-07-13 20:50:40 +01:00
Zetok Zalbavar	99ce719b80	chore: remove unnecessary indentation from merge commit message	2016-07-05 14:47:24 +01:00
Zetok Zalbavar	784d42d8d7	chore(test-pr.sh): add test-pr.sh script as requested ... Add missing copyright stuff to `merge-pr.sh`. Refactored & split `merge-pr.sh` script, since most of required code for `test-pr.sh` already existed there. Differences from `merge-pr.sh`: * if there's no `upstream` remote, https version is used instead of git * merge commit *is not* GPG-signed (less hassle) * merge branch is named e.g. `test1234` instead of `merge1234` * instructions for pushing test branch onto upstream master are not printed	2016-06-19 10:22:02 +01:00