Martin Langhoff wrote: > When tracking several branches from a repo, git-pull does a fetch (of > all the remote heads) and merges _only the tracking branch currently > checked out_. That's ok. However, if I checkout another tracking > branch and issue git-pull, the merge does not happen because git-fetch > finds nothing new on the remote side. git-pull should merge anyway if > remotes/origin/<trackinghead> is ahead of the local head. > > The workaround is to call git-merge explicitly, but git-pull is > misleading the user saying "nothing to merge" instead of completing > the merge. Strange. This would be regression, but in my experience "git pull" _always_ merges, even if there is nothing to fetch. But I don't have branch to merge configured... -- 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
