]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1dd340 c1f352c)
Merge branch 'stable-1.2' 77/4777/1
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 10 Dec 2011 00:06:47 +0000 (01:06 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 10 Dec 2011 00:06:47 +0000 (01:06 +0100)
* stable-1.2:
  Fix version.sh
  Throw API exception when MergeCommand hits checkout conflicts
  Add methods for configuring platform emulation
  Fix history rendering not to occupy too many lanes
  Fix History rendering

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

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