Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.egit
AgeCommit message (Expand)AuthorFilesLines
2018-06-22bump versionslgoubet2-2/+2
2018-06-22Extension point to provide specific matching rules for equality helperStéphane Thibaudeau1-1/+3
2018-06-22EMF Compare is compatible with JGit 5.* versionsStéphane Thibaudeau1-1/+1
2018-06-22Use white-list strategy to retrieve the Model providerStéphane Thibaudeau4-41/+29
2018-06-22EMF Compare is no longer compatible with egit < 4.2lgoubet1-1/+1
2018-06-04[534365] Fix RecursiveModelMerger for "binary" git attributesArthur Daussy1-2/+7
2018-06-04Do not handle "merged" files twice when JGit stages themArthur Daussy1-5/+23
2018-06-04[535200] Create a new TreeWalk instead reusing oneArthur Daussy2-112/+229
2018-05-16Fix JGit dependency version range3.3.3M7b3.3.3Laurent Delaigue1-1/+1
2018-03-13Memory leak during automatic merge operations from EGitLaurent Goubet1-1/+6
2018-01-30Bump plugin and feature versions for Photon3.3.3M5lgoubet2-2/+2
2018-01-24[530250] Fix RecursiveModelMerger to be able to handle Git attributesArthur Daussy1-1/+2
2017-10-09API break in JGit 4.9 due to the fix for bug 517128Laurent Goubet2-4/+4
2017-08-23Bumping versions for Oxygen.13.3.2RC1Laurent Goubet2-2/+2
2017-06-29Bug 518608 - Duplicated / Mixed Stage not allowed exception in importedAntonio Campesino1-3/+12
2017-05-11Compatibility with guava 21Laurent Goubet1-1/+1
2017-04-07Bump versions for EMF Compare 3.3.1Laurent Goubet2-2/+2
2017-02-13[496582] Consider preferences scope hierarchyLaurent Delaigue1-1/+1
2017-01-24Use try with resource where possibleLaurent Delaigue1-11/+5
2017-01-24Depend on JDK-7Laurent Delaigue3-387/+387
2016-09-14Bump versions for EMF Compare 3.3.0Laurent Goubet2-2/+2
2016-09-12Add support for additive mergeLaurent Delaigue5-1/+91
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud8-42/+47
2016-06-14[495961] incompatibility between log4j 1.x and 2.xLaurent Goubet1-1/+1
2016-05-27Remove unused msg in mergetext.propertiesLaurent Delaigue1-1/+0
2016-01-22Use JGit provided progress monitorMathieu Cartaud5-8/+154
2015-12-08Fix bug in "Replace with Local History"Laurent Delaigue1-52/+50
2015-10-12Fix bugs caused by an EGit updateMathieu Cartaud2-4/+4
2015-09-29[477767] Introduce new MatchingStrategy for models shared with git3.2.0M2Axel Richard3-1/+143
2015-09-24Fix warningsLaurent Delaigue5-1/+5
2015-09-24[464739] ResourceLocationChanges become ResourceattachmentChanges.MOVEAxel Richard1-5/+21
2015-09-24[476207] Handle Move kind for ResourceAttachmentChangesAxel Richard3-1/+304
2015-09-24Merge with new remote projectsAxel Richard1-8/+30
2015-09-23Add RecursiveModelMerge through EGit mergeStrategy extension pointAxel Richard8-8/+668
2015-09-23Model Merge Tool + classes to do model merges with EGitMathieu Cartaud17-1/+1750
2015-09-04Revert commit ff36ec9 Add RecursiveModelMerge through EGit mergeStrategyAxel Richard24-2453/+5
2015-09-02Add RecursiveModelMerge through EGit mergeStrategy extension pointLaurent Delaigue24-5/+2453
2015-05-05Fix some of the warnings3.1.0M7Laurent Goubet1-1/+1
2015-04-14Introduce git-specific support to fix unuseable storage pathsLaurent Goubet13-0/+745

    Back to the top