]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b1ade5 c32694e)
Merge branch 'master' into stable-6.2 34/193934/1
authorAndrey Loskutov <loskutov@gmx.de>
Fri, 3 Jun 2022 13:49:45 +0000 (15:49 +0200)
committerAndrey Loskutov <loskutov@gmx.de>
Fri, 3 Jun 2022 13:51:54 +0000 (15:51 +0200)
commit2ef2a3562e9aa5c826ce063a2f1d3d8ffef1f0ce
treeb0f2988a40474499808220cd7d5fe677d87b6600tree | snapshot
parent7b1ade51d24f6efacfddd91fcfed7137c27642d3commit | diff
parentc32694e5ae98e5c1373afcb535a76d37e5d82a29commit | diff
Merge branch 'master' into stable-6.2

* master:
  Adapt diff- and merge tool code for PGM and EGit usage
  Teach JGit to handle external diff/merge tools defined in
.gitattributes

Change-Id: I3aefc14160caaac859bd3548460dd755ebe42fc5
org.eclipse.jgit/META-INF/MANIFEST.MF diff1 | diff2 | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit