OSDN Git Service

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)
commit51a0908a6f3e996051b5df076cd20e8bd9712333
tree16b97b33b48b87ef16f5ecd8b538baa5710f27da
parentb9d23c21104fd7eac8163b65248fae6e580291cc
parent434c64df669284af7e19fafd0ab496bc075cd24b
Merge branch 'pt/am-builtin'

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