summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2013-10-14 19:04:36 +0200
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 12:45:22 -0700
commitf0551693ccba62b179e774d128a9934d9f7c06ba (patch)
tree5235fdf01b2601f6a1efda9314d77181c1851818
parentba3c69a9ee1894de397b60d3b548383e13ef49e3 (diff)
downloadgit-nv/doc-config-signingkey.tar.gz
config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkey
The description of the user.signingkey option only mentioned its use when creating a signed tag. Make it clear that is is also used when creating signed commits. Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
-rw-r--r--Documentation/config.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b30c7e6278..b9211d6558 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1901,11 +1901,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.