相关疑难解决方法(0)

我这样做了一个rebase:

git rebase --onto master new_background_processing export_background_processing

这没有做我想要的,所以我执行了重置:

git reset --hard HEAD@{1}

我让我的分支恢复到原来的状态,但是当我输入git status时收到了这条消息:

# You are currently rebasing branch 'export_background_processing' on 'e378641'.

如何完全取消该rebase？不确定这本身就意味着什么.

我做了一个Git rebase,修复了冲突和强制推力,为什么它仍然是rebase模式,"dev | REBASE 2/3"？怎么退出呢？我不想丢掉这个篮板.

aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)
$ git status
rebase in progress; onto f67f4c5
You are currently rebasing branch 'dev' on 'f67f4c5'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean

aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)
$ git push --force origin dev
git@192.168.1.8's password:
Everything up-to-date

aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)

谢谢