]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.0' 05/124805/1
authorJonathan Nieder <jrn@google.com>
Thu, 21 Jun 2018 04:23:49 +0000 (21:23 -0700)
committerJonathan Nieder <jrn@google.com>
Thu, 21 Jun 2018 04:24:05 +0000 (21:24 -0700)
* stable-5.0:
  Respect "unshallow" lines in protocol v2
  Temporarily @Ignore flaky CommitCommandTest methods

Change-Id: I14bd522d2f6bafb1b41e3c730d6dbef827e3e88a
Signed-off-by: Jonathan Nieder <jrn@google.com>

Trivial merge