Yann Dirson wrote: > With current GIT HEAD, plain git-clone creates the following config > (when cloning a repo with HEAD pointing to branch "downstream": > > > [remote "origin"] > url = /export/work/yann/git/stgit/tmp/.git > fetch = +refs/heads/*:refs/remotes/origin/* > [branch "downstream"] > remote = origin > merge = refs/heads/downstream > ^^^^^^^^^^^^^^^^^^^^^ > > I would have expected "merge = remotes/origin/downstream" instead, and > this setting confuses the rebase-after-pull logic, causing it to > rebase the stack onto its own base (no-op). > > Isn't that a git-clone bug ? No, it is a feature. branch.<name>.merge is usually _remote_ head, to allow pulling without local tracking branch. IIRC there was patch to allow to use local head, if it is ambiguous. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html