diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-09-06 13:44:10 +0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-09-06 13:44:10 +0300 |
| commit | 7334d718ed079d34fa4e8b376534079e0d4afa60 (patch) | |
| tree | 6ff0d82c982b2e1d5da17a42be19ac3a877058b8 /doc/user/project | |
| parent | d1b60cbc67dc14b21820ef3f823a8e1ea851697d (diff) | |
| parent | ee6ca17c5f4950e62fb483fd56b43293d0f80fc3 (diff) | |
Merge branch 'mmarif4u/gitlab-ce-36859-update-gpg-docs-with-gpg2' into 'master'
Resolve "Update the docs for GPG for gpg2 - [secret key not available]"
Closes #36859
See merge request !14024
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/repository/gpg_signed_commits/index.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index afe8066d408..20aadb8f7ff 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -31,6 +31,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: |