diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2018-05-15 15:19:06 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-15 15:19:06 +0200 |
| commit | 8d1a470669073f3c6d98da267700cf182d40376f (patch) | |
| tree | 0577678f584eafc48d037ac33168aac82e8b7b46 /dev/doc | |
| parent | cfed57b021b89018d1bb30c6aa0957299fe35d8d (diff) | |
git / gpg integration link
Diffstat (limited to 'dev/doc')
| -rw-r--r-- | dev/doc/MERGING.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md index 84ff94c66..106ef7842 100644 --- a/dev/doc/MERGING.md +++ b/dev/doc/MERGING.md @@ -111,7 +111,8 @@ 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/> +<https://ekaia.org/blog/2009/05/10/creating-new-gpgkey/>. To link it with +git, use https://help.github.com/articles/telling-git-about-your-gpg-key/. 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. |