]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df64186 434c64d)
Merge branch 'pt/am-builtin' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:45 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:45 +0000 (14:32 -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 patch | diff1 | diff2 | blob | history

diff --cc builtin/am.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.