On Fri, Sep 05, 2014 at 02:28:46PM +0400, Sergey Organov wrote: ... > # Then I realize I need more changes and it gets complex enough to > # warrant a topic branch. I create the 'topic' branch that will track > # 'master' branch and reset 'master' back to its origin (remote > # origin/master in original scenario). > > git checkout -b topic > git branch --force master origin_master
This line is the problem, because the purpose of the `--fork-point` argument to `git rebase` is designed to help people recover from upstream rebases, which is essentially what you create here. So when rebase calculates the local changes it realises (from the reflog) that the state of master before this command was before you created the branch, so only commits after it should be picked. For the case when the upstream of a branch is remote, this is normally what you want. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
