我已经写了一个脚本来确定重定位。不能说不知道哪个分支要重新对齐
当我运行$ my-rebase
,我得到一个错误:
You asked me to pull without telling me which branch you want to rebase against, and 'branch.rohan_branch1.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull '). See git-pull(1) for details.
If you often rebase against the same branch, you may want to use something like the following in your configuration file:
[branch "rohan_branch1"] remote = <nickname> merge = <remote-ref> rebase = true [remote "<nickname>"] url = <url> fetch = <refspec>
我有主分支(工作拷贝),然后我创建rohan_branch1;在某些时候,我似乎在主人身上做了重新设定。
现在我想保持rohan_branch1是最新的。我怎样才能摆脱这个错误?
这将是张贴你的脚本 – CharlesB 2012-07-10 06:22:39
注意了Git 1.8.5将引入一个有用[巧妙的方法来保存对合并'拉--rebase'(HTTP ://stackoverflow.com/a/18756102/6309) – VonC 2013-09-12 05:37:50