Re: git merge man page, upstream

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

Re: git merge man page, upstream

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