aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/README.md
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-01-20 13:39:19 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-01-20 13:39:31 +0100
commite6f97efbca63faaf250368493cdeb308af34dc85 (patch)
tree420dcc12475469562a20cc6485863b5c9bee8363 /contrib/devtools/README.md
parent55781444130c359307d0611b310c6f5e8a511e91 (diff)
parentda6d18b6c7a4c305b661684ccda23083731bbb08 (diff)
Merge pull request #7378
da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)
Diffstat (limited to 'contrib/devtools/README.md')
-rw-r--r--contrib/devtools/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index fcb2275fc9..1103ca86c5 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -56,14 +56,14 @@ Usage: `git-subtree-check.sh DIR COMMIT`
`COMMIT` may be omitted, in which case `HEAD` is used.
-github-merge.sh
+github-merge.py
===============
A small script to automate merging pull-requests securely and sign them with GPG.
For example:
- ./github-merge.sh bitcoin/bitcoin 3077
+ ./github-merge.py 3077
(in any git repository) will help you merge pull request #3077 for the
bitcoin/bitcoin repository.