|
|
|
@ -12,7 +12,7 @@ For example:
|
|
|
|
|
./github-merge.py 3077
|
|
|
|
|
|
|
|
|
|
(in any git repository) will help you merge pull request #3077 for the
|
|
|
|
|
bitcoin/bitcoin repository.
|
|
|
|
|
devrandom/gitian-builder repository.
|
|
|
|
|
|
|
|
|
|
What it does:
|
|
|
|
|
* Fetch master and the pull request.
|
|
|
|
@ -30,8 +30,8 @@ couldn't mess with the sources.
|
|
|
|
|
|
|
|
|
|
Setup
|
|
|
|
|
---------
|
|
|
|
|
Configuring the github-merge tool for the bitcoin repository is done in the following way:
|
|
|
|
|
Configuring the github-merge tool for this repository is done in the following way:
|
|
|
|
|
|
|
|
|
|
git config githubmerge.repository bitcoin/bitcoin
|
|
|
|
|
git config githubmerge.repository devrandom/gitian-builder
|
|
|
|
|
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
|
|
|
|
|
git config --global user.signingkey mykeyid (if you want to GPG sign)
|
|
|
|
|