Difference between revisions of "EGit/New and Noteworthy/0.10"

From Eclipsepedia

Jump to: navigation, search
(Merge Tool)
Line 21: Line 21:
 
= Merge Tool =
 
= Merge Tool =
  
EGit now supports a visual merge tool to better support resolving conflicts detected during merge, rebase or cherry-pick
+
EGit now supports a [[EGit/User_Guide#Using_Merge_Tool | visual merge tool]] to better support resolving conflicts detected during merge, rebase or cherry-pick
  
 
[[Image:Egit-0.10-merge-tool.png]]
 
[[Image:Egit-0.10-merge-tool.png]]

Revision as of 19:30, 15 December 2010

Contents

Pull Support

EGit now supports Pull for branches which are configured to track remote branches. When local branches are created based on a remote tracking branch EGit will automatically establish a tracking relationship.

Rebase Support

EGit now supports Rebase with options to abort, skip, and continue when rebase finds conflicts .

EGit-0.10-StartRebaseFromRepoView.png

When conflicts are detected during rebase the following dialog presents the options how to proceed

EGit-0.10-RebaseConflictDialog.png

Cherry-pick Support

EGit now supports Cherry-pick

CherryPick1.png

Merge Tool

EGit now supports a visual merge tool to better support resolving conflicts detected during merge, rebase or cherry-pick

Egit-0.10-merge-tool.png

HTTP Authentication

EGit now supports HTTP basic and digest authentication. This helps users sitting behind firewalls which often block git: and ssh: traffic. User credentials can be optionally stored in the Eclipse Secure Store.

Drag and Drop Support

The repositories view now supports drag and drop. You can drag a folder or a list of folders from the file system into the Repositories View. If the folders are a valid Git repository or a direct parent of a .git folder, they will be added as a repository to the view.

PDE Build Fetch Factory

In the org.eclipse.egit.fetchfactory plug-in TODO

Commits

TODO