From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Mar 2018 23:17:35 +0000 (-0800)
Subject: Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
X-Git-Tag: v2.18.0-rc0~134^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e2f0288ef7b94f39abe694d0f0bfd0db192998c;p=thirdparty%2Fgit.git

Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files

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

2e2f0288ef7b94f39abe694d0f0bfd0db192998c