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 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: - +. 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 From 83a3806ce85a012366709931a158bea85bf39d5b Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Tue, 15 May 2018 15:22:06 +0200 Subject: Update MERGING.md Actually there are more general instructions --- dev/doc/MERGING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev') diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md index 106ef7842..0ff14d112 100644 --- a/dev/doc/MERGING.md +++ b/dev/doc/MERGING.md @@ -112,7 +112,7 @@ 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/. +git & github, follow 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. -- cgit v1.2.3 From 2ba954ae93bad18de93e689f29d482250c966f3e Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Tue, 15 May 2018 16:54:36 +0200 Subject: Update MERGING.md Simpler --- dev/doc/MERGING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dev') diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md index 0ff14d112..a466124c1 100644 --- a/dev/doc/MERGING.md +++ b/dev/doc/MERGING.md @@ -109,10 +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: -. To link it with -git & github, follow https://help.github.com/articles/signing-commits-with-gpg/. +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. -- cgit v1.2.3