Eclipse Community Forums: EGit / JGit » interactive rebase view

Home » Eclipse Projects » EGit / JGit » interactive rebase view(interactive rebase view)

interactive rebase view [message #1199310]

Wed, 20 November 2013 14:53

Eclipse User

I just noticed a couple of days ago that EGit includes an interactive rebase view. Not sure how long this has been there, but it's pretty nice. My only question is this: does EGIt provide a way to start an interactive rebase? The Rebase menu/toolbar item doesn't seem to offer this, or if it does it's pretty well hidden.

For now I run the Git command in a shell (or external launcher) and then manually open the view in Eclipse. That's perfectly workable, but I have the feeling there must be an EGit equivalent to 'git rebase -i <ref>' somewhere.

Re: interactive rebase view [message #1200560 is a reply to message #1199310]

Thu, 21 November 2013 04:48

Eclipse User

Le 20/11/2013 20:53, R Shapiro a écrit :
> I just noticed a couple of days ago that EGit includes an interactive
> rebase view. Not sure how long this has been there, but it's pretty
> nice. My only question is this: does EGIt provide a way to start an
> interactive rebase? The Rebase menu/toolbar item doesn't seem to offer
> this, or if it does it's pretty well hidden.

From what I remember of the demo at the ECE2013 talk, interactive
rebase is started from the History view by right-clicking on the commit
on which to do the rebase; I don't remember how the menu action is
called however.

Re: interactive rebase view [message #1200634 is a reply to message #1200560]

Thu, 21 November 2013 05:34

Eclipse User

Le 21/11/2013 10:48, Pierre-Charles David a écrit :
> Le 20/11/2013 20:53, R Shapiro a écrit :
>> I just noticed a couple of days ago that EGit includes an interactive
>> rebase view. Not sure how long this has been there, but it's pretty
>> nice. My only question is this: does EGIt provide a way to start an
>> interactive rebase? The Rebase menu/toolbar item doesn't seem to offer
>> this, or if it does it's pretty well hidden.

Ah, and just then I see this:

http://m-sohn.blogspot.fr/2013/11/interactive-rebase-with-egit-32.html

Re: interactive rebase view [message #1200884 is a reply to message #1200560]

Thu, 21 November 2013 08:11

Eclipse User

Quote:

interactive rebase is started from the History view by right-clicking on the commit

Aha, the one place I forget to check. Thanks for the pointer.

On a somewhat related topic I see that EGit still uses the weird phrasing "rebase on top of". I don't know where that came from but everyone else in the Git universe says "rebase onto". I pointed this out here quite awhile ago, someone really should make this trivial fix.

Re: interactive rebase view [message #1216677 is a reply to message #1200884]

Thu, 28 November 2013 10:35

Eclipse User

rebase --onto does something different, I guess that's the reason why we use a different text, but I agree it sounds a bit strange.
Any better proposals ?

Re: interactive rebase view [message #1218735 is a reply to message #1216677]

Fri, 29 November 2013 07:07

Eclipse User

Hmm, yes, you're right about '--onto'. I never looked closely enough at the documentation. How about 'from', as in rebase from <upstream>?

Re: interactive rebase view [message #1219007 is a reply to message #1218735]

Fri, 29 November 2013 09:55

Eclipse User

I feel "from" is the wrong direction since the currently checked out branch is moving on a new base
during rebase, maybe better "to" (I am not a native English speaker) ?

Re: interactive rebase view [message #1219090 is a reply to message #1219007]

Sun, 01 December 2013 12:17

Eclipse User

The ideal preposition in English would probably be 'on'. In the most common case the branch being rebased was based ON some other branch, and is now being based ON that same other branch again, at a later point in its history.

The problem with 'on' is that it's so close to 'onto', which is exactly what tripped me up earlier. Still, I would say 'on' is better than 'on top of', which I know has confused some users (because they came and asked me what it meant).

Re: interactive rebase view [message #1219169 is a reply to message #1219090]

Mon, 02 December 2013 08:18

Eclipse User

proposed a path for review
https://git.eclipse.org/r/#/c/19190/

Re: interactive rebase view [message #1219170 is a reply to message #1219169]

Mon, 02 December 2013 08:18

Eclipse User

s/path/patch/

Re: interactive rebase view [message #1219845 is a reply to message #1219170]

Fri, 06 December 2013 04:06

Eclipse User

this patch was merged and will be part of 3.2.0