From: "Torsten Bögershausen" <tboegi@web.de>
To: "Frank Schäfer" <fschaefer.oss@googlemail.com>, git@vger.kernel.org
Subject: Re: git diff: meaning of ^M at line ends ?
Date: Mon, 14 May 2018 20:13:43 +0200 [thread overview]
Message-ID: <8d7e4807-9a79-e357-8265-95f22ab716e0@web.de> (raw)
In-Reply-To: <6c23ed9e-4a14-12e4-20ca-3ac6f80cf9ec@googlemail.com>
On 14.05.18 18:08, Frank Schäfer wrote:
> What does ^M at the end of lines in the output of 'git diff' mean ?
>
> Thanks,
> Frank
>
^M is the representation of a "Carriage Return" or CR.
Under Linux/Unix/Mac OS X a line is terminated with a single
"line feed", LF.
Windows typically uses CRLF at the end of the line.
"git diff" uses the LF to detect the end of line,
leaving the CR alone.
Nothing to worry about.
If you want, you can commit those files with
CRLF in the working tree, and LF in the repo.
More information may be found here:
https://git-scm.com/docs/gitattributes
(Or ask more questions here, if needed)
next prev parent reply other threads:[~2018-05-14 18:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 16:08 git diff: meaning of ^M at line ends ? Frank Schäfer
2018-05-14 18:13 ` Torsten Bögershausen [this message]
2018-05-15 18:04 ` Frank Schäfer
2018-05-18 15:03 ` Torsten Bögershausen
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d7e4807-9a79-e357-8265-95f22ab716e0@web.de \
--to=tboegi@web.de \
--cc=fschaefer.oss@googlemail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).