diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2018-05-15 16:54:36 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-15 16:54:36 +0200 |
| commit | 2ba954ae93bad18de93e689f29d482250c966f3e (patch) | |
| tree | d1ef611073893a4764e7017d6faf787b0d33f231 /dev/doc | |
| parent | 83a3806ce85a012366709931a158bea85bf39d5b (diff) | |
Update MERGING.md
Simpler
Diffstat (limited to 'dev/doc')
| -rw-r--r-- | dev/doc/MERGING.md | 6 |
1 files changed, 2 insertions, 4 deletions
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: -<https://ekaia.org/blog/2009/05/10/creating-new-gpgkey/>. 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. |