diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-04-01 15:33:41 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-04-09 08:23:24 -0400 |
| commit | fa385c3a8be0889d4c50f5168e8de0c6edee3597 (patch) | |
| tree | 09ad7867f2ab7f18a5f60c0f289b5c0f82ea802d /contrib/devtools | |
| parent | 2a09a78c08360204d748010f58d8114fc550aaec (diff) | |
| download | bitcoin-fa385c3a8be0889d4c50f5168e8de0c6edee3597.tar.xz | |
[doc] devtools: Setup ots git integration
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 ================ |