diff options
| author | Maik Schreiber | 2014-06-19 13:20:52 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2014-06-25 22:43:49 +0000 |
| commit | e7a0ec115347e2d147b8794d78cc5a8883f1cc3e (patch) | |
| tree | b9a394b3e4eaaf957420a4066f5258c8c820d382 /org.eclipse.egit.ui/plugin.xml | |
| parent | df52b57528097f988607e965a2cd93e6565e3da1 (diff) | |
| download | egit-e7a0ec115347e2d147b8794d78cc5a8883f1cc3e.tar.gz egit-e7a0ec115347e2d147b8794d78cc5a8883f1cc3e.tar.xz egit-e7a0ec115347e2d147b8794d78cc5a8883f1cc3e.zip | |
Add support for cherry-picking multiple commits at once.
This modifies the Cherry Pick menu item in the History view such that
multiple selected commits may be cherry-picked at once, instead of
one-by-one.
Cherry-picking now uses the mechanics of interactive rebase. If a
conflict occurs during merging one of the commits, it needs to be
resolved manually, and then the interactive rebase may be resumed
(just like with a regular interactive rebase.)
Cherry-picking a single commit uses the same mechanics just mentioned.
Change-Id: I23d1339072c9557af530c9e3f8d6636cf24fbac1
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')
0 files changed, 0 insertions, 0 deletions