Interactive Rebase

with EGit 3.2available in Luna M3

planned release Dec 18, 2013

Matthias Sohn (SAP)@masohn

EGit < 3.2and some mexican roads…

(interactive)

commit --amend

branch

editlatest commit

rebase

B

branch

rebaseonto a new base

A

A’

B’

interactive rebase

edit series of consecutivecommits

on same base

C

B’

A

branch

B

E’

D

E

edit

squash

reword

C+D

interactive rebase actions

Action DescriptionReorder reorder commits

Skip remove commit

Edit amend commit

Reword edit message

Squash combine with previous commitincl. 2nd message

Fixup combine with previous commitexcl. 2nd message

interactive rebase

edit series of consecutivecommits

onto new base

C

B’

A

branch

B

E’

D

E

edit

squash

reword

C+D

X new base

DEMO

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 fromhttp://www.eclipse.org/downloads/index-developer.phpThis table lists which of these packages contain EGithttp://www.eclipse.org/downloads/compare.php?release=luna

EGit 3.2 will be released on Dec 18, 2013