Merge branch 'bb/git-gui-ssh-key-files'
commit8b09611475b6095003a08baccb136e885e11a1dd
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:48 +0000 (25 13:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:48 +0000 (25 13:28 +0900)
tree7a8f22979426220f53997b67659912c2e261741e
parentfe0a9eaf31dd0c349ae4308498c33a5c3794b293
parent2e2f0288ef7b94f39abe694d0f0bfd0db192998c
Merge branch 'bb/git-gui-ssh-key-files'

"git gui" learned that "~/.ssh/id_ecdsa.pub" and
"~/.ssh/id_ed25519.pub" are also possible SSH key files.

* bb/git-gui-ssh-key-files:
  git-gui: search for all current SSH key types