diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-10 15:27:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-10 15:29:10 +0200 |
| commit | ebd786b72a2a15143d7ef4ea2229fef121bd8f12 (patch) | |
| tree | 1d83d84719753fbc9128829d3e8a3beb0e92000b /contrib/devtools | |
| parent | dd1ca9e0b300f33eee0edcfe22024cef12c6a155 (diff) | |
| parent | fa385c3a8be0889d4c50f5168e8de0c6edee3597 (diff) | |
| download | bitcoin-ebd786b72a2a15143d7ef4ea2229fef121bd8f12.tar.xz | |
Merge #12852: [doc] devtools: Setup ots git integration
fa385c3 [doc] devtools: Setup ots git integration (MarcoFalke)
Pull request description:
Document the simple steps on how to set up ots git integration.
Tree-SHA512: 1b9f99bfaa6cd9dc581243d3a3584301645e95450acc3b5898dcdb53849569de16bb8ef2676b18f6b8dd402de10aee80119e15c1b28cef36f17ad121cbba2ba3
Diffstat (limited to 'contrib/devtools')
| -rw-r--r-- | contrib/devtools/README.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 8ca8fa9066..15ee8a3959 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -144,6 +144,14 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll 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) +Create and verify timestamps of merge commits +--------------------------------------------- +To create or verify timestamps on the merge commits, install the OpenTimestamps +client via `pip3 install opentimestamps-client`. Then, dowload the gpg wrapper +`ots-git-gpg-wrapper.sh` and set it as git's `gpg.program`. See +[the ots git integration documentation](https://github.com/opentimestamps/opentimestamps-client/blob/master/doc/git-integration.md#usage) +for further details. + optimize-pngs.py ================ |