From fa385c3a8be0889d4c50f5168e8de0c6edee3597 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 1 Apr 2018 15:33:41 -0400 Subject: [PATCH] [doc] devtools: Setup ots git integration --- contrib/devtools/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 8ca8fa906..15ee8a395 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 ================