From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 15 May 2007 10:25:13 GMT
Subject: Re: newby question about merge.
Message-ID: <20070515102513.GB2893@steel.home>
In-Reply-To: <20070515113820.2621c8d5@localhost.localdomain>

picca, Tue, May 15, 2007 11:38:20 +0200:
> So I do a merge like this
> "git merge upstream ." when I am on the master branch to work on the new
> package.

loose the dot. git-merge syntax is "git merge branch1 [branch2...]"