Skip to main content
  • Log in
  • Manage Cookies
projects.eclipse.org
Download
  • Projects
  • Working Groups
  • Members
  • Community
    • Marketplace
    • Events
    • Planet Eclipse
    • Newsletter
    • Videos
    • Blogs
  • Participate
    • Report a Bug
    • Forums
    • Mailing Lists
    • Wiki
    • IRC
    • Research
  • Eclipse IDE
    • Download
    • Learn More
    • Documentation
    • Getting Started / Support
    • How to Contribute
    • IDE and Tools
    • Newcomer Forum
  • More
      • Community

      • Marketplace
      • Events
      • Planet Eclipse
      • Newsletter
      • Videos
      • Blogs
      • Participate

      • Report a Bug
      • Forums
      • Mailing Lists
      • Wiki
      • IRC
      • Research
      • Eclipse IDE

      • Download
      • Learn More
      • Documentation
      • Getting Started / Support
      • How to Contribute
      • IDE and Tools
      • Newcomer Forum
  1. Home
  2. Projects
  3. Eclipse Technology
  4. Eclipse EGit™: Git...
  5. 5.12.0
  6. Review Information

Eclipse EGit™: Git Integration for Eclipse 5.12.0

Primary tabs

  • Overview
  • Issues
  • Release Plan
  • Review Information(active tab)
Description: 

Features

  • 441149 [merge] Hide changes between ancestor and current for cherry-pick
  • 441149 [merge] Use working tree filtered to 'ours' as input for conflicts
  • 573222 API: RevUtils and factory methods for IFileRevisions
  • 573222 GitInfo API: access to commit ID and index state
  • 573222 Provide a GitInfo accessor interface as API
  • 399982 Handle modify-delete conflicts in "Replace With->Ours/Theirs"

Usability Improvements

  • Simplify labels for "Replace With->Ours/Theirs"
  • 399982 Add "Replace With->Ours/Theirs" sub-menus for IFiles
  • Staging view: display conflict state information
  • Re-label "Finish" button in RepositorySearchWizard

Performance Improvements

  • Staging view: minor optimization building folder hierarchies
  • 560412 [osgi] Disperse the EGit core Activator into OSGi dynamic services

Bug Fixes

  • 573232 [merge] Use EFS-linked IResources for non-workspace files
  • 483596 [merge] Detect conflicting files underneath ignored folders
  • 482154 [merge] Fix base for cherry-picks and rebases
  • 548813 [merge] Fix toggling changes with edited stage 2 as "ours"
  • 548813 [merge] Record in index whether conflicting file has been updated
  • 573922 Use a job name for the HiddenResources clean-up at start-up
  • 572748 Store/restore main SashForm orientation
  • 572101 ExternalRepositoryScanner: WorkingTreeModifiedEvent needs Repository
  • 571994 Make ResourceRefreshHandler work for non-workspace files
  • 571984 Ensure nested git repositories are picked up

Build and Release Engineering

  • Update Orbit to R20210602031627
  • Update jetty to 9.4.41.v20210516
  • [releng] Update eclipse-jarsigner-plugin to 1.3.1
  • Unify determining the "theirs" commit
  • [oomph] Update and cycle API baselines
  • Remove cvs feature
API Certification: 

The project leadership certifies that the APIs in this release are "Eclipse Quality".

Conforms To UI/UX Guidelines: 
Not verified
This release is part of Eclipse IDE 2021-06.
Eclipse EGit™: Git Integration for Eclipse

Project Links

  • Getting Started
  • Website

Related Projects

Related Projects:

  • Eclipse Technology
    • Eclipse JGit™: Java implementation of Git

Project Hierarchy:

  • Eclipse Technology
  • Eclipse EGit™: Git Integration for Eclipse

Tags

Technology Types
  • OSGi
  • Tools
Build Technologies
  • Jenkins
  • Maven
  • Tycho

Eclipse Foundation

  • About Us
  • Contact Us
  • Donate
  • Members
  • Governance
  • Code of Conduct
  • Logo and Artwork
  • Board of Directors

Legal

  • Privacy Policy
  • Terms of Use
  • Copyright Agent
  • Eclipse Public License
  • Legal Resources

Useful Links

  • Report a Bug
  • Documentation
  • How to Contribute
  • Mailing Lists
  • Forums
  • Marketplace

Other

  • IDE and Tools
  • Projects
  • Working Groups
  • Research@Eclipse
  • Report a Vulnerability
  • Service Status

Copyright © Eclipse Foundation. All Rights Reserved.

Back to the top