Hello, the git merge man page, OPTIONS, <commit> ... states: "If no commit is given from the command line, and if merge.defaultToUpstream configuration variable is set, merge the remote tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page." Actually, in this case git merge merges the upstream branch, not the remote tracking branch. Proposed change: "If no commit is given from the command line, and if merge.defaultToUpstream configuration variable is set, merge the upstream branches that the current branch has currently configured. See also the configuration section of this manual page." -Angelo Borsotti -- 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