[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git patch won't apply
From: |
Johannes Schindelin |
Subject: |
Re: Git patch won't apply |
Date: |
Mon, 12 Jan 2009 13:45:18 +0100 (CET) |
User-agent: |
Alpine 1.00 (DEB 882 2007-12-20) |
Hi,
On Mon, 12 Jan 2009, Trevor Daniels wrote:
> Valentin Villenave wrote Sunday, January 11, 2009 6:30 PM
>
> > By the way, one sensible addition to the CG might be to invite Windows
> > users to do
> >
> > git config global.autocrlf = false
> >
> > or something like that (by default under Windows, git converts all
> > line endings to crlf)
>
> I'm not sure this is advisable, or that the assertion is correct.
>
> Git requires only LF endings in the repository, but Windows uses CRLF
> natively.
>
> If autocrlf = true, CRLF endings are converted to LF during commit and
> LF endings are converted to CRLF during checkout. This seems eminently
> sensible. This is the option I use, seemingly without problem.
The problem starts when at least one file was committed _with_ CR/LF.
Then Git fscks up.
I have been meaning to work on this for a long time, alas, other things
take priority.
Ciao,
Dscho
> ps BTW, Macs use just CR natively, which really screw up git for Windows
> users if present in the repository, although easy to fix once
> understood. Does autocrlf affect this in any way?
P.S.: as this applies only to MacOS < 10 (AKA X), we just don't care.
- Re: Git patch won't apply, (continued)
- Re: Git patch won't apply, Neil Puttock, 2009/01/10
- Re: Git patch won't apply, John Mandereau, 2009/01/10
- Re: Git patch won't apply, Graham Percival, 2009/01/10
- Re: Git patch won't apply, Valentin Villenave, 2009/01/11
- Re: Git patch won't apply, Johannes Schindelin, 2009/01/11
- Re: Git patch won't apply, Valentin Villenave, 2009/01/11
- Re: Git patch won't apply, Johannes Schindelin, 2009/01/11
- Re: Git patch won't apply, Trevor Daniels, 2009/01/12
- Re: Git patch won't apply, Valentin Villenave, 2009/01/12
- Re: Git patch won't apply, Trevor Daniels, 2009/01/12
- Re: Git patch won't apply,
Johannes Schindelin <=
- Re: Git patch won't apply, Trevor Daniels, 2009/01/12
Re: Git patch won't apply, Carl D. Sorensen, 2009/01/10
- Re: Git patch won't apply, John Mandereau, 2009/01/10
- Re: Git patch won't apply, Carl D. Sorensen, 2009/01/10
- Re: Git patch won't apply, John Mandereau, 2009/01/10
- Re: Git patch won't apply, Carl D. Sorensen, 2009/01/10
- Re: Git patch won't apply, John Mandereau, 2009/01/10
- Re: Git patch won't apply, Carl D. Sorensen, 2009/01/10
- Re: Git patch won't apply, Reinhold Kainhofer, 2009/01/10
- Re: Git patch won't apply, Carl D. Sorensen, 2009/01/10