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/2.1"
(→Improved conflict markers for rebase/cherry-pick conflicts) |
(→MultiPullResultDialog supports multi-selection) |
||
| Line 7: | Line 7: | ||
== MultiPullResultDialog supports multi-selection == | == MultiPullResultDialog supports multi-selection == | ||
Details button in MultiPullResultDialog can now also work with multi-selections | Details button in MultiPullResultDialog can now also work with multi-selections | ||
| + | |||
| + | == Staging View prompts if there are unsaved files on commit == | ||
== Delete untracked files in Staging View and Repositories View == | == Delete untracked files in Staging View and Repositories View == | ||
Revision as of 16:37, 4 September 2012
Note that 2.1 is not yet released, please install from the Nightly Update Site to use these features.
Contents
- 1 EGit Features
- 1.1 "Push to Gerrit..." action
- 1.2 MultiPullResultDialog supports multi-selection
- 1.3 Staging View prompts if there are unsaved files on commit
- 1.4 Delete untracked files in Staging View and Repositories View
- 1.5 Commit using Ctrl+Enter (Cmd+Enter) in Staging View and Commit Dialog
- 1.6 Show warnings/errors on files in Staging View and Commit Dialog
- 1.7 Context menu in Git Tree Compare view
- 1.8 Improved conflict markers for rebase/cherry-pick conflicts
- 1.9 Garbage Collector and Repository Storage Statistics
- 2 Bugs Closed
EGit Features
"Push to Gerrit..." action
MultiPullResultDialog supports multi-selection
Details button in MultiPullResultDialog can now also work with multi-selections
Staging View prompts if there are unsaved files on commit
Delete untracked files in Staging View and Repositories View
The Staging View now has a context menu action Delete which makes it possible to delete untracked files directly from the view. The Repositories View has the same action.
When all the selected files are workspace resources, it's possible to undo the delete using the Edit -> Undo menu.
Before, it was always necessary to locate the file in the Package Explorer or Navigator. In the case of non-workspace resources, it was necessary to leave Eclipse.
Commit using Ctrl+Enter (Cmd+Enter) in Staging View and Commit Dialog
After having entered the commit message, it's now possible to commit using the Ctrl+Enter (or Cmd+Enter on Mac OS X) shortcut instead of clicking on the toolbar icon.
Show warnings/errors on files in Staging View and Commit Dialog
When there is a problem on a file, it was previously only possible to see this in the Package Explorer or Navigator. Now the decorations are also shown when preparing a commit, in the Commit Dialog and in the Staging View:
The Git Tree Compare view now has a context menu, with Open Working Tree Version and a Show In menu:
It now also acts as a selection provider, so that other views (e.g. History view) can track the selection of the Tree Compare view.
Improved conflict markers for rebase/cherry-pick conflicts
Instead of OURS/THEIRS, the conflict markers now show more useful information. For example, a conflicting cherry-pick:
<<<<<<< master a ======= b >>>>>>> bad1dea Message of the commit I'm cherry-picking
A conflict during rebase:
<<<<<<< Upstream, based on master a ======= b >>>>>>> b161dea Message of a commit I'm rebasing
Garbage Collector and Repository Storage Statistics
Bugs Closed
56 Bugs and 17 enhancement requests were closed