diff options
| author | M M Arif <gitea@fake.local> | 2017-09-01 21:55:18 +0800 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-09-04 11:26:56 +0200 |
| commit | ee6ca17c5f4950e62fb483fd56b43293d0f80fc3 (patch) | |
| tree | c6550223c2c5eba7568c3bbd877cdfdd14482b1d | |
| parent | da426369fd7813bf5245e76b5322839442cdcb5f (diff) | |
| download | gitlab-ce-mmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2.tar.gz | |
Added changelogmmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2
| -rw-r--r-- | changelogs/unreleased/36859-update-gpg-docs-with-gpg2.yml | 5 | ||||
| -rw-r--r-- | doc/user/project/repository/gpg_signed_commits/index.md | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/36859-update-gpg-docs-with-gpg2.yml b/changelogs/unreleased/36859-update-gpg-docs-with-gpg2.yml new file mode 100644 index 00000000000..e48a5704fdd --- /dev/null +++ b/changelogs/unreleased/36859-update-gpg-docs-with-gpg2.yml @@ -0,0 +1,5 @@ +--- +title: Update gpg documentation with gpg2 +merge_request: 13851 +author: M M Arif +type: other diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index ff419d714f9..859de10590a 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -30,6 +30,16 @@ to be met: ## Generating a GPG key +>**Notes:** +- If your Operating System has `gpg2` installed, replace `gpg` with `gpg2` in + the following commands. +- If Git is using `gpg` and you get errors like `secret key not available` or + `gpg: signing failed: secret key not available`, run the following command to + change to `gpg2`: + ``` + git config --global gpg.program gpg2 + ``` + If you don't already have a GPG key, the following steps will help you get started: |