Community
Participate
Working Groups
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
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.
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/
Reopening, see the previous comment.
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
*** Bug 316521 has been marked as a duplicate of this bug. ***
I think we can now declare we reached this, kudos to Tobias Pfeifer
