Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 23:17:35 +0000 (15:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 23:17:35 +0000 (15:17 -0800)
commit2e2f0288ef7b94f39abe694d0f0bfd0db192998c
tree4b34762ab984fd100b14aa97d4f07a674726a8a4
parent7e31236f652ad9db221511eaf157ce0ef55585d6
parent6a47fa0efa342daa53c6386538fda313420351a5
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
git-gui/lib/sshkey.tcl