diff options
| author | Maik Schreiber | 2014-02-06 12:54:50 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2014-02-11 20:58:59 +0000 |
| commit | 2cab2681962da8cb782746b972edd6af7547bb52 (patch) | |
| tree | cea7e0efe369121298a8b880134d7c7566bada05 /org.eclipse.egit.ui/plugin.xml | |
| parent | 39d0de7be0846cd65814c77e44730d52e0d449a2 (diff) | |
| download | egit-2cab2681962da8cb782746b972edd6af7547bb52.tar.gz egit-2cab2681962da8cb782746b972edd6af7547bb52.tar.xz egit-2cab2681962da8cb782746b972edd6af7547bb52.zip | |
Add ability to squash commits directly from the history view.
This adds a new menu item Modify > Squash to the context menu
of the history view. It can be used to squash multiple (contiguous)
selected commits into one, prompting for a commit message as well.
An error will be displayed if the selected commits cannot be reached
from the current HEAD commit. This is done so as to avoid the need
to checkout another commit automatically before executing the squash
procedure.
The "Modify" sub-menu is chosen so that new menu items (such as
"Reword" or "Edit") can be added to it rather than the history
context menu directly.
CQ: 7906
Bug: 316521
Change-Id: Ib725899074282027d7542c2ac8bc2c5a9a01da72
Signed-off-by: Maik Schreiber <blizzy@blizzy.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.xml')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 13f799cb09..175b640990 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -4568,6 +4568,14 @@ icon="icons/obj16/cherry-pick.png"> </image> <image + commandId="org.eclipse.egit.ui.history.Squash" + icon="icons/obj16/squash.gif"> + </image> + <image + commandId="org.eclipse.egit.ui.commit.Squash" + icon="icons/obj16/squash.gif"> + </image> + <image commandId="org.eclipse.egit.ui.commit.Checkout" icon="icons/obj16/checkout.gif"> </image> @@ -5219,6 +5227,16 @@ name="%CherryPickCommand.name"> </command> <command + defaultHandler="org.eclipse.egit.ui.internal.history.command.SquashHandler" + id="org.eclipse.egit.ui.history.Squash" + name="%SquashCommitsCommand.name"> + </command> + <command + defaultHandler="org.eclipse.egit.ui.internal.commit.command.SquashHandler" + id="org.eclipse.egit.ui.commit.Squash" + name="%SquashCommitsCommand.name"> + </command> + <command defaultHandler="org.eclipse.egit.ui.internal.history.command.RevertHandler" id="org.eclipse.egit.ui.history.Revert" name="%RevertCommand.name"> |