From 8d1a470669073f3c6d98da267700cf182d40376f Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau
Date: Tue, 15 May 2018 15:19:06 +0200
Subject: git / gpg integration link
---
dev/doc/MERGING.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'dev')
diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md
index 84ff94c66a..106ef7842f 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:
-
+. 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.
--
cgit v1.2.3