Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EGit/New and Noteworthy/0.10"
< EGit | New and Noteworthy
(→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. | ||
| − | |||
| − | |||
= Pull Support = | = Pull Support = | ||
Revision as of 19:16, 15 December 2010
Contents
Rebase Support
EGit now supports rebase with options to abort, skip, and continue when rebase finds conflicts .
When conflicts are detected during rebase the following dialog presents the options how to proceed
Cherry-pick Support
EGit now supports cherry-pick
Merge Tool
EGit now supports a visual merge tool to better support resolving conflicts detected during merge, rebase or cherry-pick
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