From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Mon, 25 Apr 2011 14:08:06 GMT
Subject: Re: Cloning into an existing, non-empty directory?
Message-ID: <BANLkTimi8Q+2bK3QdWdJdX1V-WbrU+AbdA@mail.gmail.com>
In-Reply-To: <20110425075750.GA28172@elie>

2011/4/25 Jonathan Nieder <jrnieder@gmail.com>:

> 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".

Ugh. I must have copied the wrong command into my script and then ran
with it, trying to fix the error I was getting in the wrong place.
Sorry for that.
I am running with environment variables and without any explicit
--work-tree --git-dir as well and everything works just fine.

In case anyone is interested, I attached the working version.


Thanks a lot for your help, I really appreciate it!
Richard