]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 105bfd9 6e0f8ba)
Merge branch 'stable-4.10' 03/117403/1
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 14 Feb 2018 22:28:17 +0000 (23:28 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 14 Feb 2018 22:28:28 +0000 (23:28 +0100)
* stable-4.10:
  Fix ssh host name handling for Jsch
  Jsch overrides the port in the URI with the one in ~/.ssh/config

Change-Id: I860fc61ceb12ae792b1ee7421046ecd32373b9f8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Trivial merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit