简体繁体 English

git rebase-使用EGit，不支持吗？

[英]git rebase --onto with EGit, no support?

原文 2015-07-27 14:54:35 3 1 eclipse/ git/ egit/ feature-branch

I have a typical use case working with feature branches and Git, as follows: 我有一个使用功能分支和Git的典型用例，如下所示：

I want to rebase my feature branch onto master, without applying the commits from the branch "1.24", I have managed to do this from the command line specifying all the parameters, but I still cant find a graphical way to do this from eclipse. 我想将功能分支重新建立到主分支上，而不应用分支“ 1.24”中的提交，我设法从命令行中指定了所有参数，但是我仍然找不到从eclipse进行图形化操作的图形方法。

What do you do on these cases? 您在这些情况下如何处理？ It is happening the same to me with merging, I believe this is a very common scenario on GitFlow workflow. 合并对我来说也是一样，我相信这是GitFlow工作流程中非常常见的场景。

1 个解决方案

While your feature branch is checked out. 当您的feature分支签出时。 Select "Rebase on" in context menu of master branch. 在master分支的上下文菜单中选择“基于”。 That will rebase target branch with all commits that are not on master. 这将使用不在master上的所有提交重新建立目标分支的基础。 That would be a typical use of rebase, not exactly what --onto does, however. 那将是rebase的一种典型用法，而不是--onto的确切用途。

Update : 更新：

To select just a partial branch you can use interactive rebase (select "Interactive rebase" in context menu of target branch). 要仅选择部分分支，可以使用交互式基础库（在目标分支的上下文菜单中选择“交互式基础库”）。 It is very quick to use, so you can use it instead of --onto, which I think is not implemented in EGit in any form. 它使用起来非常快，因此您可以使用它代替--onto，我认为它没有以任何形式在EGit中实现。