Skip to content

Commit

Permalink
Merge branch 'nv/doc-config-signingkey'
Browse files Browse the repository at this point in the history
* nv/doc-config-signingkey:
  config doc: user.signingkey is also used for signed commits
  • Loading branch information
jrn committed Oct 14, 2013
2 parents 774282d + f055169 commit 110f415
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 110f415

Please sign in to comment.