X-Recipient: archive-cygwin@delorie.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@cygwin.com From: Michael Lutz Subject: Re: Invoking GUI programs over SSH Date: Sat, 22 Jan 2011 14:29:29 +0100 Lines: 24 Message-ID: References: <4D34BD64.9050904@bopp.net> <20110119155957.GA12142@ednor.casa.cgf.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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: OpenPGP: id=31DEFEF1 X-IsSubscribed: yes Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Delivered-To: mailing list cygwin@cygwin.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