Re: git merge man page, upstream

[Matthieu Moy]

Angelo Borsotti angelo.borso...@gmail.com writes:

 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.

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.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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

Re: git merge man page, upstream

[Matthieu Moy]

Angelo Borsotti angelo.borso...@gmail.com writes:

 Hi Matthieu,

 the upstream branch can also be a local branch.

In this case, it's:

[branch branch]
remote = .
merge = refs/heads/master

which can arguably be considered as a special case of remote branch
whose location happens to be .. But as said in the patch, I don't mind
if someone wants to drop the remote-tracking mention on top of my patch.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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