From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Tue, 23 Oct 2012 11:35:43 GMT
Subject: Re: git merge man page, upstream
Message-ID: <vpqehkpqv3k.fsf@grenoble-inp.fr>
In-Reply-To: <CAB9Jk9CEbT=Y=yjw2tPSLiLibejDSheabcBPEpHCLa_TS+6Cpw@mail.gmail.com>

Angelo Borsotti <angelo.borsotti@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/