Merge branch 'pt/am-builtin' into maint
commit14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:45 +0000 (16 14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:45 +0000 (16 14:32 -0700)
treefa9dd851bbbb17089b4101a2ccc6e2efbd19674e
parentdf64186f63fef8daef0fb4aedfa76aaf22b70b75
parent434c64df669284af7e19fafd0ab496bc075cd24b
Merge branch 'pt/am-builtin' into maint

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
builtin/am.c