From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:11 +0000 (+0900)
Subject: Merge branch 'lm/credential-netrc'
X-Git-Tag: v2.18.0-rc0~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/017b7c52fc00897c72f6c4808ded43c4c5f9c5b8?ds=inline;hp=-c

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
---

017b7c52fc00897c72f6c4808ded43c4c5f9c5b8