Merge branch 'lm/credential-netrc'
commit017b7c52fc00897c72f6c4808ded43c4c5f9c5b8
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:11 +0000 (30 14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:11 +0000 (30 14:04 +0900)
tree83869f9d9a095155417a1ec616f4ce4198b689ff
parentab48bc0aeadd7f6b661bc125a913e1c7d145cd5e
parent786ef50a23cbd0e93d1e41982cfaba76801ed885
Merge branch 'lm/credential-netrc'

Update credential-netrc helper (in contrib/) to allow customizing
the GPG used to decrypt the encrypted .netrc file.

* lm/credential-netrc:
  git-credential-netrc: accept gpg option
  git-credential-netrc: adapt to test framework for git