Skip to content

Commit ebd786b

Browse files
committed
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
2 parents dd1ca9e + fa385c3 commit ebd786b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

contrib/devtools/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll
144144
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
145145
git config --global user.signingkey mykeyid (if you want to GPG sign)
146146

147+
Create and verify timestamps of merge commits
148+
---------------------------------------------
149+
To create or verify timestamps on the merge commits, install the OpenTimestamps
150+
client via `pip3 install opentimestamps-client`. Then, dowload the gpg wrapper
151+
`ots-git-gpg-wrapper.sh` and set it as git's `gpg.program`. See
152+
[the ots git integration documentation](https://github.com/opentimestamps/opentimestamps-client/blob/master/doc/git-integration.md#usage)
153+
for further details.
154+
147155
optimize-pngs.py
148156
================
149157

0 commit comments

Comments
 (0)