From: Junio C Hamano <gitster@pobox.com>
To: "Stephen Sinclair" <radarsat1@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how to properly update dumb-hosted repo (using rsync..?)
Date: Mon, 17 Dec 2007 15:46:44 -0800 [thread overview]
Message-ID: <7v3au06g0r.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <9b3e2dc20712171511r41e6bd4p64d243747ad4d2af@mail.gmail.com> (Stephen Sinclair's message of "Mon, 17 Dec 2007 18:11:47 -0500")
"Stephen Sinclair" <radarsat1@gmail.com> writes:
> $ git-pull
> Warning: No merge candidate found because value of config option
> "branch.master.merge" does not match any remote branch fetched.
> No changes.
> -------------------
>
> However I haven't done any branching in this cloned repo, it is
> immediately after a git-clone from the web server.
>
> My .git/config basically looks like this, minus the "core" section:
>
> -------------------
> [remote "origin"]
> url = http://my.server.com/git/project.git
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> -------------------
>
> Which seems fine to me...
> Any ideas?
A dumb question. does "git ls-remote origin" show what you expect to be
there? Specifically, does refs/heads/master exist?
prev parent reply other threads:[~2007-12-17 23:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-17 23:11 how to properly update dumb-hosted repo (using rsync..?) Stephen Sinclair
2007-12-17 23:46 ` Junio C Hamano [this message]
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=7v3au06g0r.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=radarsat1@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).