Merge branch 'pt/am-builtin'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Oct 2015 22:43:40 +0000 (15:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Oct 2015 22:43:40 +0000 (15:43 -0700)
When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey, which was fixed.

* pt/am-builtin:
  am: configure gpg at startup

1  2 
builtin/am.c

diff --cc builtin/am.c
Simple merge