X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,SPF_HELO_PASS,T_RP_MATCHES_RCVD,T_TO_NO_BRKTS_FREEMAIL
X-Spam-Check-By:	sourceware.org
To:	cygwin AT cygwin DOT com
From:	Michael Lutz <Michi_cc AT gmx DOT net>
Subject:	Re: Invoking GUI programs over SSH
Date:	Sat, 22 Jan 2011 14:29:29 +0100
Lines:	24
Message-ID:	<ihem3s$3q0$1@dough.gmane.org>
References:	<AANLkTi=m0aJ+xo6Gcr_CYWtMcVJjc0SBxfubnuXeg3Br AT mail DOT gmail DOT com> <4D34BD64 DOT 9050904 AT bopp DOT net> <AANLkTi=9rNRhtx=dwQari9v+Rrsun9Yg1VwgTnZoNeLz AT mail DOT gmail DOT com> <AANLkTikujecFG_j4-E1z8tD_9Zupy1TpW_cdFeJ52XTW AT mail DOT gmail DOT com> <ih3ntk$7aj$1 AT dough DOT gmane DOT org> <AANLkTik5jFdKfG8Gza89zECW92Tu6tdV+xKUk_9=0SgH AT mail DOT gmail DOT com> <ih67fc$fnq$1 AT dough DOT gmane DOT org> <AANLkTik0rxN_Y5AAfoJEs-+KTt87f6MA+f7P_m0KpQBD AT mail DOT gmail DOT com> <ih6lo8$ita$3 AT dough DOT gmane DOT org> <AANLkTikz150UHB_VLvirv2cc4MX8NcwVM2ZiPQ8r7uFk AT mail DOT gmail DOT com> <20110119155957 DOT GA12142 AT ednor DOT casa DOT cgf DOT cx> <AANLkTimgcSSawumtUp9tAHXxf77zGHstsz5bmu9muOyQ AT mail DOT gmail DOT com> <AANLkTinZTWvFyRG2nMZiyRm7=SizNi+LvP-jTZMeYfPe AT mail DOT gmail DOT com> <AANLkTimjEN_CoFZ3OJt2WCkFxMTjUG=7Pd3o=aSZsvS- AT mail DOT gmail DOT com> <ih8mte$vbp$1 AT dough DOT gmane DOT org> <ihbr6s$6ht$1 AT dough DOT gmane. org> <AANLkTikCp+deO_cJEaoH27=z8rrWvtRk+fhoMC4e3E=V AT mail DOT gmail DOT com> <ihc3nt$ulh$1 AT dough DOT gmane DOT org> <AANLkTi=j1PwVXv7BisGBu8rh49eH-T9MBWquKwzh9YxE AT mail DOT gmail DOT com>
Mime-Version:	1.0
User-Agent:	Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.23) Gecko/20090812 Lightning/0.9 Thunderbird/2.0.0.23 Mnenhy/0.7.5.0
In-Reply-To:	<AANLkTi=j1PwVXv7BisGBu8rh49eH-T9MBWquKwzh9YxE@mail.gmail.com>
OpenPGP:	id=31DEFEF1
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Unsubscribe:	<mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

Am 22.01.2011 03:01 schrieb David Antliff:

> I do want to have CRLF endings in my files, because merge tools like
> kdiff3 (on Windows) require CRLF files. We could live without kdiff3,
> however changing this setting "down the track" is a harder problem to
> solve than using 'set -o igncr'. All sorts of strange problems occur
> if people stop using autocrlf=true. We have a very large number of
> repositories and clones, making a global change difficult, but perhaps
> not impossible.

Well, if you use both software that requires CRLF (though kdiff3 in my
experience doesn't) and software that requires LF (bash) on the same
files, there isn't much git can do to solve that conflict.

If it's a different set of files though (i.e. LF for .sh files, CRLF for
source code or whatever), you might benefit from switching to the newer
core.eol mechanism, which allows to override the line endings for
individual files through .gitattributes. Refer to

http://www.kernel.org/pub/software/scm/git/docs/git-config.html
http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html


Michael Lutz


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -