]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc9df9c 05fd016)
Merge branch 'stable-4.3' 12/72112/2
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 4 May 2016 23:13:35 +0000 (01:13 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 4 May 2016 23:13:45 +0000 (01:13 +0200)
* stable-4.3:
  Scan loose ref before packed in case gc about to remove the loose
  Fix possible NPEs when reporting transport errors
  Fix calling of clean/smudge filters from Checkout,MergeCommands
  Fix ApplyCommand when result of patch is an empty file

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

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