From: Angelo Borsotti <angelo.borsotti@gmail.com>
Date: Tue, 23 Oct 2012 09:07:15 GMT
Subject: Re: git merge man page, upstream
Message-ID: <CAB9Jk9CEbT=Y=yjw2tPSLiLibejDSheabcBPEpHCLa_TS+6Cpw@mail.gmail.com>
In-Reply-To: <vpqk3uhr5gp.fsf@grenoble-inp.fr>

Hi Matthieu,

the upstream branch can also be a local branch.

-Angelo