{"push_id":654738202,"size":14,"distinct_size":14,"ref":"refs/heads/master","head":"68eaed4fc6e936ea4c9b190cee595593a599b0d3","before":"13853529d9df56abdda0c2c7adea2d63e6446da7","commits":[{"sha":"3070b99c846daf472650e3019df68b923542460b","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"EGit v4.0.0.201503231230-m1\n\nChange-Id: I39679883ceea596b96551e04634701f6ab8bb61e\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/3070b99c846daf472650e3019df68b923542460b"},{"sha":"767f77b7c86a9e03834957bf9848f9e9fabc5732","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Use CBI eclipse-jarsigner-plugin 1.1.2-SNAPSHOT\n\nCBI recently fixed a couple of resource leaks which probably caused\njar signing failures on Hudson (bug 464947). JGit builds were also\naffected. Hence use version 1.1.2-SNAPSHOT until a new release is\navailable. Remove dash's eclipse-signing-maven-plugin which we don't\nuse anymore since a while.\n\nBug:464947\nChange-Id: If44fd7256b1a818a226d66fbfa7e00f665b68c9f\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/767f77b7c86a9e03834957bf9848f9e9fabc5732"},{"sha":"274817ca5ed97a4ce20255ceb8b0056809063f5c","author":{"email":"e89ab3d2a7582fdb11dd4891a1facace33441f3c@obeo.fr","name":"Laurent Delaigue"},"message":"Introduce internal API to integrate Team merging.\n\nTeam provides a number of APIs to provide access to merge,\ncomparison and synchronization features. This introduces a\ngit-specific Subscriber implementation that can retrieve\ninformation from three different sources, along with\nimplementations to use the index or a TreeWalk to populate\nthese three 'sources'.\n\nCQ: 9453\nBug: 418151\nJGit-Dependency: I722352e619794988791c452545d57b17dada407a\nChange-Id: Ieda23bb556d342f421f03b93c7faa160998598aa\nAlso-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nSigned-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/274817ca5ed97a4ce20255ceb8b0056809063f5c"},{"sha":"68cf77a93f5b82d80141bfd7456b49421480d6a5","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Prepare post 4.0.0-m1 builds\n\nChange-Id: I7cdb75c3f0aa8dbcde1a4a120dc2ee4b51642dad\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/68cf77a93f5b82d80141bfd7456b49421480d6a5"},{"sha":"8f5a2665bb41db2226ed32f49ddf67fc58074cab","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Merge branch 'master' into stable-4.0\n\nChange-Id: I8677905bb875756b204d7bfecacbcaccdcad18ea\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/8f5a2665bb41db2226ed32f49ddf67fc58074cab"},{"sha":"a58ec8aa9d83450cc1e4435955aa28cabcedd1e3","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Remove org.eclipse.egit.ui.importer from build\n\nTo workaround bug 466361 remove org.eclipse.egit.ui.importer from the\nbuild until this problem is fixed.\n\nBug: 466361\nChange-Id: I23f5c036b18ec2ebc286a8a9f83c5787b20e4108\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/a58ec8aa9d83450cc1e4435955aa28cabcedd1e3"},{"sha":"6945ce516cf1eaa2aeb356b0493db3a04db7650b","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"EGit v4.0.0.201505050340-m2\n\nAlso move up version definition for jboss Tycho plugins to parent pom.xml\n\nChange-Id: Iafa66f101659354d753457e4f4b53e854c002748\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/6945ce516cf1eaa2aeb356b0493db3a04db7650b"},{"sha":"9e92bdd4e079b5abacc20a1ffe863f16fae8e9a1","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Prepare post 4.0.0-m2 builds\n\nChange-Id: I83072080d4ea186a2195831ab6ee2dfaf9bfd880\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/9e92bdd4e079b5abacc20a1ffe863f16fae8e9a1"},{"sha":"6448848ce4aaffc0f3d4cc6d240f4478eef33ca0","author":{"email":"446760a3fbea85cd5f8f4f5c3de304fe3a38014f@sap.com","name":"Matthias Sohn"},"message":"Merge branch 'stable-4.0'\n\n* stable-4.0:\n  Prepare post 4.0.0-m2 builds\n  EGit v4.0.0.201505050340-m2\n  Remove org.eclipse.egit.ui.importer from build\n  Prepare post 4.0.0-m1 builds\n  EGit v4.0.0.201503231230-m1\n\nChange-Id: If969b01a8f1c3fcb708e4f59d15335e73cde56b1\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/6448848ce4aaffc0f3d4cc6d240f4478eef33ca0"},{"sha":"80f67aa315fa52f735e871d9639e633fa4933be8","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Use a workspace-aware merging strategy when working from EGit\n\nThis introduces an Eclipse-specific sub-class of the\nRecursiveMerger that will make use of the mergers provided\nby ModelProviders instead of ignoring them to always use\nEGit's custom merging algorithms.\n\nAny file which does not have a specific merger (or which\nmerger cannot be found, such as for files outside of the\nworkspace) is still handled as it would by the\nRecursiveMerger.\n\nChange-Id: I1b27061ab215ebe600baef56f4e19a038c4b31a8\nAlso-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nSigned-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>\nSigned-off-by: Matthias Sohn <matthias.sohn@sap.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/80f67aa315fa52f735e871d9639e633fa4933be8"},{"sha":"9f330f99e11fcb65f18e256ad287dd7fe74e1dc7","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Let the ModelProviders compare their own file formats.\n\nTeam allows ModelProviders to provide their own means of\ncomparing their supervised files. This changes EGit's merge\ntool so that it uses this information instead of always\ncomputing its own \"textual\" differences between files.\n\nChange-Id: Ie38c9e6d8de0d9b6a8194c48ff0aa9e33489b243\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-By: Axel Richard <axel.richard@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/9f330f99e11fcb65f18e256ad287dd7fe74e1dc7"},{"sha":"7dc1a9c3c2fefed96d8e841fa244b7bdcc820e86","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Fix regression when calling the merge tool on folders\n\nChange-Id: Iadc891d4a028e58c50f9ad44aac5ce536e072838\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Axel Richard <axel.richard@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/7dc1a9c3c2fefed96d8e841fa244b7bdcc820e86"},{"sha":"f64d62073ae7638aedf2cd85b84d69a50f3a49af","author":{"email":"42242780430d3653fc08c401d94f102195bbc111@eclipsesource.com","name":"Alexandra Buzila"},"message":"[wip] Provide a remote mapping context to ModelProviders\n\nAllow model providers to use remote information when trying\nto determine whether a file is a part of a logical model or\nnot. When a file has been deleted locally, or when a file\nhas been created on one of the remote sides, the local side\nis not enough to compute a full model. ModelProviders will\nneed access to the remote file data to take these \"unknown\"\nfiles into account.\n\nChange-Id: I956dfb13093781accca36142cd87cf01b479fe1a\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nSigned-off-by: Alexandra Buzila <abuzila@eclipsesource.com>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Alexandra Buzila <abuzila@eclipsesource.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/f64d62073ae7638aedf2cd85b84d69a50f3a49af"},{"sha":"68eaed4fc6e936ea4c9b190cee595593a599b0d3","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Comparison not work when model resource not exist in other branch\n\nChange-Id: I734c700aa326c3a7d276c0540056eaf3d5652644\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/68eaed4fc6e936ea4c9b190cee595593a599b0d3"}]}