Help us understand the problem. What is going on with this article?

git diff すると末尾に ^M が表示される

More than 3 years have passed since last update.

Windows環境の方が良く出くわすと思われます。

現象

git diffで変更のあった行の末尾に ^Mがついていて見づらい/邪魔/恥ずかしい。
before.png

対処法

行末のキャリッジリターンを許容してあげる。

git config --global core.whitespace cr-at-eol

設定ファイルいじる派のあなたは

.gitconfig
[core]
  whitespace = cr-at-eol

結果

after.png

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away