On Sun, Dec 15, 2013 at 3:08 PM, Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> wrote:
----- Ursprungligt meddelande -----
> Från: "Matthias Sohn" <matthias.sohn@xxxxxxxxx>
> Till: "Robin Rosenberg" <robin.rosenberg@xxxxxxxxxx>
> Kopia: "EGit developer discussion" <egit-dev@xxxxxxxxxxx>
> Skickat: lördag, 14 dec 2013 22:48:15
> Ämne: Re: [egit-dev] Rebase usability
>
> On Sat, Dec 14, 2013 at 4:20 PM, Robin Rosenberg <robin.rosenberg@xxxxxxxxxx
> > wrote:
>
> >
> > First, It's marvelous to see rebase in EGit. Rebase has been one of the
> > main reasons
> > to use the command line extensively.
> >
> > On usability, I wonder wheter doing like C Git does is the right thing.
> > I'd expect
> > the selected version should be included in the rebase for several reasons.
> > I know
> > C Git does not. In the command this is easily fixes, just do "git rebase
> > -i commit^".
> >
>
> We copied C Git's behavior since we thought this is what users would expect
> so which are the reasons to include the selected version ?
Often I want to rebase after identifying a commit that I want to edit, so I
have selected it already, and as I mentioned, in a filtered view it's hard
to select the parent.
We could try this and change the behavior so that the selected commit is
included in the rebase todo list, we just have to educate the users about
There's one case where this probably doesn't make much sense:
you can also select a commit which is not a predecessor but on a side branch
and start interactive rebase to edit commits between HEAD and the common
predecessor and at the same time rebase on the new base.
Let's say I want to edit C and also rebase C - D on X
A -- B -- C -- D <-- HEAD
Then with the current behavior I can select X and click "Rebase Interactive"
and then set the action "Edit" on B and I will get
and rebase will stop at C' to allow amending this commit. Not sure if
it would make sense to also include B and X into the rebase todo list in this case.
We also could add a couple of additional commands to provide shortcuts for
frequently used actions, the menu could look like