Fix rebase > continue when nothing left to commit.
commit9dcb21678cb223d64a292874390decc2fa5e29bd
authorMarkus Duft <markus.duft@salomon.at>
Fri, 9 Mar 2012 12:40:15 +0000 (9 13:40 +0100)
committerStefan Lay <stefan.lay@sap.com>
Fri, 9 Mar 2012 13:08:41 +0000 (9 14:08 +0100)
tree89610bed14ef2ed8715dcf39a6093a7c9058ccce
parentfff71d586bb438009b0bced4150cea3fa6326649
Fix rebase > continue when nothing left to commit.

If after resolving all conflicts nothing is left to commit, behave like
cgit, and display a nice message informing the user.

Currently, EGit displays a "HEAD advanced fast forward" message, which
is absolutely not helpful at all.

This depends on a change with the same ID in jgit!

Bug: 336812
Change-Id: If2665005cf54a5b51c0fe80bad019fa42b0205af
org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties