git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Thomas Singer <thomas.singer@syntevo.com>
Cc: git@vger.kernel.org
Subject: Re: Move repository from OS X to Windows
Date: Wed, 11 Nov 2009 09:08:35 -0800	[thread overview]
Message-ID: <20091111170833.GB45475@gmail.com> (raw)
In-Reply-To: <4AFABCF8.9060601@syntevo.com>

On Wed, Nov 11, 2009 at 02:32:40PM +0100, Thomas Singer wrote:
> Hi,
> 
> I've cloned a very large repository on OS X and want to move that to Windows
> (trying to avoid to clone the repository a second time). What steps should I
> do to make it working (currently, I'm getting an error on pull/merge that
> "Entry 'foo' is not uptodate. Cannot merge.")?


Check the git documentation for "core.filemode" and "core.autocrlf".

My guess is that you need to set core.filemode false.
If it's not that then look into core.autocrlf.


Good luck,

-- 
		David

      parent reply	other threads:[~2009-11-11 17:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-11 13:32 Move repository from OS X to Windows Thomas Singer
2009-11-11 15:53 ` Pascal Obry
2009-11-11 17:08 ` David Aguilar [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=20091111170833.GB45475@gmail.com \
    --to=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=thomas.singer@syntevo.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).