I think you should not resolve the commit since then the user doesn't see anymore that he is basing the new branch on a certain remote tracking branch, also setup of tracking relationship (used by pull) can't work with that. So instead use the remote tracking branch's ref