From: "Shawn O. Pearce" <spearce@spearce.org>
To: Thomas Glanzmann <thomas@glanzmann.de>
Cc: GIT <git@vger.kernel.org>
Subject: Re: Publishing Question: First time Pushing to nonexsiting directory
Date: Mon, 19 Feb 2007 15:03:32 -0500 [thread overview]
Message-ID: <20070219200332.GA27565@spearce.org> (raw)
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.
next prev parent reply other threads:[~2007-02-19 20:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-19 7:35 Publishing Question: First time Pushing to nonexsiting directory Thomas Glanzmann
2007-02-19 8:10 ` Shawn O. Pearce
2007-02-19 19:44 ` Thomas Glanzmann
2007-02-19 20:03 ` Shawn O. Pearce [this message]
2007-02-19 20:10 ` Thomas Glanzmann
2007-02-19 8:33 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070219200332.GA27565@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=thomas@glanzmann.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox