From: Junio C Hamano Date: Fri, 16 Oct 2015 21:32:45 +0000 (-0700) Subject: Merge branch 'pt/am-builtin' into maint X-Git-Tag: v2.6.2~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc?hp=--cc 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 --- 14f1467493a8d4c094b5f07fa2564b7e1b0eb7bc