unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Tim X <timx@nospam.dev.null>
To: help-gnu-emacs@gnu.org
Subject: Re: Hiding ^M
Date: Wed, 24 Feb 2010 17:57:01 +1100	[thread overview]
Message-ID: <87tyt72kaq.fsf@lion.rapttech.com.au> (raw)
In-Reply-To: mailman.1754.1266974624.14305.help-gnu-emacs@gnu.org

Óscar Fuentes <ofv@wanadoo.es> writes:

> Tim X <timx@nospam.dev.null> writes:
>
>>> I agree, but the advice does not apply here because that major mode
>>> displays a series of diffs taken from all edited files on a git working
>>> tree. Some have crlf line endings, and they are shown as ^M.
>>
>> Doesn't GIT have some sort of setting to handle this?
>
> It has settings for eol conversion. In this case, I don't want those
> conversions to take effect, because those files are supposed to have
> crlf line endings.
>

Under SVN, if you set eol-style to native, the SVN client takes care of
all this conversion stuff - it does not get into the repository - more
specifically, differences in client eol requirements are handled at the
client level and therefore don't affect what is in the repository and at
the same time eliminate issues of different eol styles because of users
with different clients. I would expect GIT to have something similar. 

Tim
>
>
>

-- 
tcross (at) rapttech dot com dot au


  parent reply	other threads:[~2010-02-24  6:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <mailman.1672.1266873261.14305.help-gnu-emacs@gnu.org>
2010-02-23  5:52 ` Hiding ^M Torsten Mueller
2010-02-23 18:14   ` Óscar Fuentes
     [not found]   ` <mailman.1719.1266948904.14305.help-gnu-emacs@gnu.org>
2010-02-23 21:31     ` Tim X
2010-02-24  1:23       ` Óscar Fuentes
     [not found]       ` <mailman.1754.1266974624.14305.help-gnu-emacs@gnu.org>
2010-02-24  6:57         ` Tim X [this message]
2010-02-23 17:43 ` Mike Treseler
2010-02-22 20:59 Óscar Fuentes
2010-02-22 21:35 ` Juanma Barranquero

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87tyt72kaq.fsf@lion.rapttech.com.au \
    --to=timx@nospam.dev.null \
    --cc=help-gnu-emacs@gnu.org \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).