diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-08 11:19:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-08 11:19:12 +0000 |
| commit | d1f7ba35960db5dd5d52b4afabfa94ea83402df9 (patch) | |
| tree | a001b19e87ec698b76e33aaed786c41f1cbd3f80 /doc/user | |
| parent | 983d6a76dad32b908189ca14047b15b197c41df1 (diff) | |
| parent | fc97de68049e45dacb598ac8c529303609df69fc (diff) | |
| download | gitlab-ce-d1f7ba35960db5dd5d52b4afabfa94ea83402df9.tar.gz | |
Merge branch 'gpg' into 'master'
update gpg_signed_commit to use 0xLONG format for gpg list keys
See merge request !13839
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/repository/gpg_signed_commits/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index 20aadb8f7ff..dfe43c6b691 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -113,7 +113,7 @@ started: 1. Use the following command to list the private GPG key you just created: ``` - gpg --list-secret-keys mr@robot.sh + gpg --list-secret-keys --keyid-format 0xLONG mr@robot.sh ``` Replace `mr@robot.sh` with the email address you entered above. @@ -167,7 +167,7 @@ key to use. 1. Use the following command to list the private GPG key you just created: ``` - gpg --list-secret-keys mr@robot.sh + gpg --list-secret-keys --keyid-format 0xLONG mr@robot.sh ``` Replace `mr@robot.sh` with the email address you entered above. |