diff options
| author |  Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-05-15 23:23:15 +0200 |
|---|---|---|
| committer | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-05-15 23:23:15 +0200 |
| commit | 76c3b46299f670f5c4dff8d1baa3fe705326d3a0 (patch) | |
| tree | db0689358fa7b026a11f0d61289a131261c151d8 /dev | |
| parent | e95c5e6d92ba9ab776444ca1376d45c584acab50 (diff) | |
| parent | 2ba954ae93bad18de93e689f29d482250c966f3e (diff) | |
Merge PR #7519: git / gpg integration link
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/doc/MERGING.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md index 84ff94c66..a466124c1 100644 --- a/dev/doc/MERGING.md +++ b/dev/doc/MERGING.md @@ -109,9 +109,8 @@ There are two cases to consider: The merge script passes option `-S` to `git merge` to ensure merge commits are signed. Consequently, it depends on the GnuPG command utility being -installed and a GPG key being available. Here is a short tutorial to -creating your own GPG key: -<https://ekaia.org/blog/2009/05/10/creating-new-gpgkey/> +installed and a GPG key being available. Here is a short documentation on +how to use GPG, git & GitHub: https://help.github.com/articles/signing-commits-with-gpg/. The script depends on a few other utilities. If you are a Nix user, the simplest way of getting them is to run `nix-shell` first. |