Re: Publishing Question: First time Pushing to nonexsiting directory

From: Shawn O. Pearce <spearce@spearce.org>
Date: Feb 19, 2007, 20:03 UTC
Message-ID: <20070219200332.GA27565@spearce.org>
In-Reply-To: <20070219194423.GJ786@cip.informatik.uni-erlangen.de>

Thomas Glanzmann <thomas@glanzmann.de> wrote:

>         (thinkpad) [~/work/astro] git pull
>         * refs/remotes/origin/master: storing branch 'master' of 131.188.30.59:/home/cip/adm/sithglan/work/repositories/private/astro

Good, the tracking branch was automatically created.

>         commit: 7a04a7e
>         Warning: No merge candidate found because value of config option
>                 "branch.master.merge" does not match any remote branch fetched.

Check your .git/config. There is no configuration describing what to do when `git pull` is invoked on your master branch. You may want to add something like the following to your .git/config:

	[branch "master"]
		remote = origin
		merge = refs/heads/master

This just says that by default, `git pull` will merge the master branch of remote origin when you are on branch master.

> Maybe it is related to the fact that git version 1.4.4.4 is running on
> faui00u (131.188.30.59).

Nope. It has to do with the fact that you are running 1.5.0 on your thinkpad and are missing the branch.master.merge entry noted above.

-- 
Shawn.