git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Richard Hartmann <richih.mailinglist@gmail.com>
Cc: "Git List" <git@vger.kernel.org>, "Nguyễn Thái Ngọc" <pclouds@gmail.com>
Subject: Re: Cloning into an existing, non-empty directory?
Date: Mon, 25 Apr 2011 03:00:10 -0500	[thread overview]
Message-ID: <20110425075750.GA28172@elie> (raw)
In-Reply-To: <BANLkTinV4cFC5vzr25V-D3PMwWx284zgoQ@mail.gmail.com>

Hi,

Richard Hartmann wrote:

> I think I reduced the test-case as much as I can

All right, sorry to be so dense.  I tried:

	git init test && cd test
	git remote add origin ~/src/some-repo
	git fetch origin

and then:

	$ git merge origin
	fatal: origin - not something we can merge

Is this what you mean?  "git merge" is not advertised as taking the
name of a remote repository as a parameter.  The usual usage is
instead to pass a commit, as in "git merge origin/master".

I'm not sure what a good meaning for "git merge <repository>" would
be.  "git pull <repository>" does "git fetch <repository>" and then,
if one of the fetched branches from <repository> is the configured
upstream for the current branch, merges it.

Ideas?  Probably the documentation or error message could use help
from someone less blind to see what a first-time reader would see.

Regards,
Jonathan

  reply	other threads:[~2011-04-25  8:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-21 21:27 Cloning into an existing, non-empty directory? Richard Hartmann
2011-04-21 22:03 ` Jonathan Nieder
2011-04-22 11:21   ` Richard Hartmann
2011-04-23 10:15     ` Jonathan Nieder
2011-04-23 10:28       ` Nguyen Thai Ngoc Duy
2011-04-23 10:37         ` Jonathan Nieder
2011-04-23 22:11       ` Richard Hartmann
2011-04-25  8:00         ` Jonathan Nieder [this message]
2011-04-25  8:40           ` Andreas Schwab
2011-04-25  8:59             ` Jonathan Nieder
2011-04-25 18:37               ` Jeff King
2011-04-25 14:08           ` Richard Hartmann

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=20110425075750.GA28172@elie \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    --cc=richih.mailinglist@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).