Jump to: navigation, search

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

(Drag and Drop Support)
Line 1: Line 1:
 +
= Rebase Support =
 +
 +
EGit now supports rebase with options to abort, skip, and continue when rebase finds conflicts .
 +
 +
[[Image:EGit-0.10-StartRebaseFromRepoView.png]]
 +
 +
When conflicts are detected during rebase the following dialog presents the options how to proceed
 +
 +
[[Image:EGit-0.10-RebaseConflictDialog.png]]
 +
 +
= Cherry-pick Support =
 +
 +
EGit now supports cherry-pick
 +
 +
[[Image:CherryPick1.png]]
 +
 +
= Merge Tool =
 +
 +
EGit now supports a visual merge tool to better support resolving conflicts detected during merge, rebase or cherry-pick
 +
 +
[[Image:Egit-0.10-merge-tool.png]]
 +
 
= Drag and Drop Support =  
 
= 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.
 
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.
 
TODO INSERT IMAGE
 
  
 
= Pull Support =
 
= Pull Support =

Revision as of 19:16, 15 December 2010

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

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.

Pull Support

TODO

Cherry-pick Support

TODO

PDE Build Fetch Factory

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

Commits

TODO