From: david.hagood@gmail.com
To: skillzero@gmail.com
Cc: david.hagood@gmail.com, git@vger.kernel.org
Subject: Re: Problems with GIT under Windows - "not uptodate"
Date: Tue, 1 Sep 2009 13:25:07 -0500 (CDT) [thread overview]
Message-ID: <e35db8f7ac1b5b2b2f080fb47f58c20a.squirrel@localhost> (raw)
In-Reply-To: <2729632a0909011119l3a19447ds9d4896a27ac488c1@mail.gmail.com>
> It seems like you want core.autocrlf to be false or you want a
> .gitattributes file to override it on a per-file basis for the files
> you know are CRLF (i.e. the ones that are CRLF even on the Linux
> side).
That's what I've been leaning toward: a .gitattributes in that directory
like this:
*.xml -crlf diff merge
Does that sound reasonable?
prev parent reply other threads:[~2009-09-01 18:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-01 15:46 Problems with GIT under Windows - "not uptodate" david.hagood
2009-09-01 16:52 ` Eric Raible
2009-09-01 22:56 ` Johannes Schindelin
2009-09-01 23:16 ` Eric Raible
2009-09-01 23:19 ` Johannes Schindelin
2009-09-01 18:19 ` skillzero
2009-09-01 18:25 ` david.hagood [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=e35db8f7ac1b5b2b2f080fb47f58c20a.squirrel@localhost \
--to=david.hagood@gmail.com \
--cc=git@vger.kernel.org \
--cc=skillzero@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).