Merge branch 'nv/commit-gpgsign-config'
commit810273bc33b1f50191f90deef74277ee84174efd
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:03 +0000 (27 14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:03 +0000 (27 14:01 -0800)
treec6295f6cd956f71be4044032f077e75f0d9b7237
parent5f95c9f850b19b368c43ae399cc831b17a26a5ac
parent4b8d14b4c5d73dd4adb354d9689022d1b87828d5
Merge branch 'nv/commit-gpgsign-config'

Introduce commit.gpgsign configuration variable to force every
commit to be GPG signed.  The variable cannot be overriden from the
command line of some of the commands that create commits except for
"git commit" and "git commit-tree", but I am not convinced that it
is a good idea to sprinkle support for --no-gpg-sign everywhere,
which in turn means that this configuration variable may not be
such a good idea.

* nv/commit-gpgsign-config:
  test the commit.gpgsign config option
  commit-tree: add and document --no-gpg-sign
  commit-tree: add the commit.gpgsign option to sign all commits
Documentation/config.txt
builtin/commit.c
builtin/merge.c