diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 19:45:50 (GMT) |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 19:45:50 (GMT) |
| commit | 110f415ce87730db48baae086b8c5f1344451bf4 (patch) | |
| tree | 3bf71677daca04c25885dee1cca8a76484f5f6b6 | |
| parent | 774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778 (diff) | |
| parent | f0551693ccba62b179e774d128a9934d9f7c06ba (diff) | |
| download | git-110f415ce87730db48baae086b8c5f1344451bf4.zip git-110f415ce87730db48baae086b8c5f1344451bf4.tar.gz git-110f415ce87730db48baae086b8c5f1344451bf4.tar.bz2 | |
Merge branch 'nv/doc-config-signingkey'
* nv/doc-config-signingkey:
config doc: user.signingkey is also used for signed commits
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index aaae06f..d4d93c9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2342,11 +2342,11 @@ user.name:: environment variables. See linkgit:git-commit-tree[1]. user.signingkey:: - If linkgit:git-tag[1] is not selecting the key you want it to - automatically when creating a signed tag, you can override the - default selection with this variable. This option is passed - unchanged to gpg's --local-user parameter, so you may specify a key - using any method that gpg supports. + If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the + key you want it to automatically when creating a signed tag or + commit, you can override the default selection with this variable. + This option is passed unchanged to gpg's --local-user parameter, + so you may specify a key using any method that gpg supports. web.browser:: Specify a web browser that may be used by some commands. |