Hi Matthiew, man pages should be clear, and easy to read. "Remote" usually means "another repository" (git glossary), and also in natural language conveys the notion of something far away. Internally, it can be handled as a special case of url, of course. My suggestion is to be consistent with the git glossary, that defines "upstream branch" as: "The default branch that is merged into the branch in question", which is exactly what that paragraph of the git-merge man page is describing. -Angelo -- 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