Presentation held at Eclipse Democamp Darmstadt 2013-11-19

1. Interactive
Rebase
with EGit 3.2
available in Luna M3
planned release Dec 18, 2013
Matthias Sohn (SAP)
@masohn

2. EGit < 3.2
and some mexican roads…
(interactive)

3. commit --amend
branch
edit
latest commit

4. rebase
branch
B’
B
rebase
onto a new base
A’
A

5. interactive rebase
branch
E
edit series of
consecutive
commits
on same base
E’
reword
C+D
squash
B’
edit
D
C
B
A

6. interactive rebase actions
Action
Description
Reorder
reorder commits
Skip
remove commit
Edit
amend commit
Reword
edit message
Squash
combine with previous commit
incl. 2nd message
Fixup
combine with previous commit
excl. 2nd message

7. interactive rebase
branch
E
edit series of
consecutive
commits
E’
reword
C+D
squash
D
C
B’
onto new base
B
X
A
new base
edit

8. DEMO

9. Installation
If you want to use this new feature install the EGit developer build
•
In Eclipse click “Help > Install New Software”
•
Paste the URL http://download.eclipse.org/egit/updates-nightly
into the field “Work with” and hit return
•
Select the EGit feature and click “Finish”
Alternatively you may download a Luna M3 Eclipse package from
http://www.eclipse.org/downloads/index-developer.php
This table lists which of these packages contain EGit
http://www.eclipse.org/downloads/compare.php?release=luna
EGit 3.2 will be released on Dec 18, 2013