Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 340967

Summary:	Add GUI for interactive rebase
Product:	[Technology] EGit	Reporter:	Oyvind Harboe <oyvind.harboe>
Component:	UI	Assignee:	Tobias Pfeifer <to.pfeifer>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	angvoz.dev, blizzy, carsten.pfeiffer, duy274qe65, eclipse, irbull, jcompagner, kondenzator, kondi.elte, lucas.panjer, markus.kell.r, matthias.sohn, paul.mealor, robert.munteanu, sascha, tomasz.adamusiak, tomasz.zarna, tratar, vkoskela
Version:	unspecified
Target Milestone:	3.2
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:	396510
Bug Blocks:	356939

Description Oyvind Harboe

2011-03-25 10:57:19 EDT

Build Identifier: M20100909-0800

A key feature of git that is hard for new users to work with is interactive rebasing.

Developing a topic branch and rewriting that branch until it's ready is an absolutely key working pattern and reason to use git in the first place.

Reproducible: Always

Comment 1 Tomasz Zarna

2012-07-05 10:41:05 EDT

Not sure when but it looks that it has been already implemented. See http://wiki.eclipse.org/EGit/User_Guide#Rebase_Conflicts. If you meant something different or the current shape is not enough feel free to reopen the bug. However, you will have to present an explanation of why this doesn't work for you.

Comment 2 Tibor Pusztai

2012-07-05 11:28:17 EDT

Tomasz, the interactive rebase is not a rebase with interactive result. 
Interactive rebase is a complex mode of the rebase command where a todo list (rebase plan) first generated based on the parameters, which can be modified by a text editor then accordingly executed step-by-step. In the todo list you have options to pause the rebase, change a comment, squash or fixup commits etc...

See these as further explanation:
http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html#_interactive_mode
http://blog.mozilla.org/webdev/2011/11/21/git-using-topic-branches-and-interactive-rebasing-effectively/

Comment 3 Tomasz Zarna

2012-07-06 04:33:25 EDT

Reopening, see the previous comment.

Comment 4 Johan Compagner

2013-01-19 05:04:19 EST

currently the only way to squash commits into 1 seems to be to do a soft reset and then commit the workspace as 1 commit.
That works quite well but only if all the commits until the starting point of th soft reset should be in. You can't skip or reorder a commit if you do want commits 1,2,4,5 but not 3

Comment 5 Robin Stocker

2013-09-27 11:18:40 EDT

*** Bug 316521 has been marked as a duplicate of this bug. ***

Comment 6 Matthias Sohn

2013-12-11 18:23:14 EST

I think we can now declare we reached this, kudos to Tobias Pfeifer