Re: newby question about merge.

From: Alex Riesen <raa.lkml@gmail.com>
Date: May 15, 2007, 10:25 UTC
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...]"

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.