interactive rebase with egit
DESCRIPTION
Presentation held at Eclipse Democamp Darmstadt 2013-11-19TRANSCRIPT
![Page 1: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/1.jpg)
Interactive Rebase
with EGit 3.2available in Luna M3
planned release Dec 18, 2013
Matthias Sohn (SAP)@masohn
![Page 2: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/2.jpg)
EGit < 3.2and some mexican roads…
(interactive)
![Page 3: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/3.jpg)
commit --amend
branch
editlatest commit
![Page 4: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/4.jpg)
rebase
B
branch
rebaseonto a new base
A
A’
B’
![Page 5: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/5.jpg)
interactive rebase
edit series of consecutivecommits
on same base
C
B’
A
branch
B
E’
D
E
edit
squash
reword
C+D
![Page 6: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/6.jpg)
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
![Page 7: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/7.jpg)
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
![Page 8: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/8.jpg)
DEMO
![Page 9: Interactive Rebase with EGit](https://reader033.vdocument.in/reader033/viewer/2022061119/54632096b1af9f86228b53f0/html5/thumbnails/9.jpg)
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