Angelo Borsotti <angelo.borso...@gmail.com> writes:
> 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
> Actually, in this case git merge merges the upstream branch, not the
> remote tracking branch.
It merges the upstream branch, which is a remote-tracking branch (notice
the - between remote and tracking, it's a branch that tracks a remote
branch, not a remote branch that tracks something).
I'll send a patch to fix that.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html