不能用rebase拉 [英] Cannot pull with rebase

问题描述

我收到此消息：

I get this message:

Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.

是的，我有没有提交的更改。我搜索了一种方法来重新整理我在pull中得到的新代码之前未提交的更改。

Yes, I have changes which are not committed. I searched a way to rebase my uncommitted changes on top of the new code which I would get from a pull.

我发现这个： https://github.com/aanand/git-up

I想知道这是否还是要走的路，或者有更现代的路要走。

I want to know if this is still the way to go, or if there are more modern ways to go.

我使用git 1.8.1版本

I use git version 1.8.1

推荐答案

您可以使用git-up的Python端口： https://github.com/msiemens/PyGitUp

You can use the Python port of git-up: https://github.com/msiemens/PyGitUp

pip install git-up

这篇关于不能用rebase拉的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！