Merge branch 'nv/doc-config-signingkey'

* nv/doc-config-signingkey:
  config doc: user.signingkey is also used for signed commits
This commit is contained in:
Jonathan Nieder 2013-10-14 12:45:50 -07:00
Родитель 774282d16a f0551693cc
Коммит 110f415ce8
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -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.