{"id":1748,"date":"2018-05-25T21:29:59","date_gmt":"2018-05-25T12:29:59","guid":{"rendered":"https:\/\/adan.jp.net\/blog\/?p=1748"},"modified":"2019-08-29T14:23:27","modified_gmt":"2019-08-29T05:23:27","slug":"git%e3%81%a7add%e3%81%97%e3%81%9f%e3%82%89%e3%80%81%e3%80%8cwarning-crlf-will-be-replaced-by-lf%e3%80%8d%e3%81%a3%e3%81%a6%e3%81%ae%e3%81%8c%e5%87%ba%e3%81%9f","status":"publish","type":"post","link":"https:\/\/adan.jp.net\/blog\/programing\/1748","title":{"rendered":"Git\u3067add\u3057\u305f\u3089\u3001\u300cwarning: CRLF will be replaced by LF\u300d\u3063\u3066\u306e\u304c\u51fa\u305f"},"content":{"rendered":"<p>\u3042\u308b\u65e5\u3001\u3044\u308d\u3044\u308d\u3068\u524a\u9664\u3057\u305f\u308a\u5909\u66f4\u3057\u305f\u308a\u3068\u3057\u3066\u3001master\u306b\u30de\u30fc\u30b8\u3057\u3066push<br \/>\n\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3067\u3001pull\u3057\u305f\u3089\u3001<\/p>\n<pre># On branch master\n# Changes not staged for commit:\n#   (use \"git add ...\" to update what will be committed)\n#   (use \"git checkout -- ...\" to discard changes in working directory)\n#\n#\tmodified:   home\/adan\/yonaha.js\n<\/pre>\n<p>\u5909\u66f4\u3082\u3057\u3066\u3044\u306a\u3044\u306e\u306b\u3001add\u304bcheckout\u3057\u3066\u304f\u308c\u3068\u51fa\u3066\u3044\u305f\u3002\u5dee\u5206\u304c\u306a\u3044\u306e\u3067\u3001\u30b3\u30df\u30c3\u30c8\u3057\u3088\u3046\u3068\u601d\u3044\u3001add\u3057\u3066\u307f\u308b\u3068\u3001<\/p>\n<pre>[yonaha@adan stage]$ git add --all\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in home\/adan\/yonaha.js.\n<\/pre>\n<p>\u306a\u3093\u3058\u3083\u3053\u308a\u3083\uff01\uff1f\u3000\u6012\u3089\u308c\u305f\u3001\u3001\u3001\u3002<\/p>\n<p>\u305d\u306e\u5f8c\u3001checkout\u3057\u3066\u3082\u3001reset\u3057\u3066\u3082\u3001pull\u3057\u3066\u3082\u3060\u3081\u3067\u3001<br \/>\n\u8abf\u3079\u3066\u307f\u308b\u3068\u3001Git\u304c\u6539\u884c\u30b3\u30fc\u30c9CRLF\u3092\u3001LF\u306b\u81ea\u52d5\u3067\u7f6e\u304d\u63db\u3048\u3066\u304f\u308c\u3066\u3044\u308b\u3089\u3057\u304f\u3001<br \/>\n\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3067\u3001\u305d\u306e\u30aa\u30fc\u30c8\u7f6e\u63db\u3092\u6b62\u3081\u308b\u30b3\u30fc\u30c9\u3092\u30b9\u30c8\u30c3\u30d7\u3067\u304d\u308b\u3089\u3057\u3044\u3002<\/p>\n<pre>[yonaha@adan stage]$ git config --global core.autoCRLF false<\/pre>\n<p>\u30c8\u30e9\u30a4\u3057\u3066\u307f\u305f\u304c\u3001\u5909\u308f\u3089\u305a\u3001\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u300c.gitconfig\u300d\u306b\u306f\u3001<\/p>\n<pre>[core]\n        autoCRLF = false<\/pre>\n<p>\u3068\u3042\u308a\u3001\u554f\u984c\u306a\u3055\u305d\u3046\u3067\u3059\u3002<\/p>\n<p>\u305d\u306e\u5f8c\u3001\u3044\u308d\u3044\u308d\u8a66\u3059\u304c\u3001<br \/>\nHEAD\u306e\u5185\u5bb9\u3067\u3001\u5f37\u5236\u7684\u306b\u4e0a\u66f8\u304d\u3059\u308b\u3053\u3068\u3067\u3001\u89e3\u6c7a\u3067\u304d\u307e\u3057\u305f\u3002<\/p>\n<pre>[yonaha@adan stage]$ git fetch origin master\n[yonaha@adan stage]$ git reset --hard origin\/master<\/pre>\n<hr><div class='adan_banner'>\n<a href='\/contact'><img src='\/blog\/wp-content\/uploads\/2019\/02\/bosyu_banner.jpeg'><\/a>\n<\/div>  <div class=\"sng-box box26\"><div class=\"box-title\">\u30d7\u30ed\u306b\u805e\u3044\u3066\u307f\u308b<\/div><div class=\"box-content\">\u682a\u5f0f\u4f1a\u793eadan\u306f\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u30ad\u30e3\u30ea\u30a2\u306b\u771f\u5263\u306b\u5411\u304d\u5408\u3063\u3066\u3044\u307e\u3059\u3002<br>\n<strong class='keiko_blue'>\u4f01\u696d\u306e\u60c5\u5831<\/strong>\u3084<strong class='keiko_blue'>\u30a8\u30f3\u30b8\u30cb\u30a2\u3068\u3057\u3066\u306e\u30ad\u30e3\u30ea\u30a2\u30a2\u30c3\u30d7<\/strong>\u306e\u65b9\u6cd5\u3001<strong class='keiko_blue'>\u73fe\u5728\u306e\u5f85\u9047\uff08\u7d66\u6599\u30fb\u5831\u916c\uff09<\/strong>\u3001<strong class='keiko_blue'>\u672a\u7d4c\u9a13\u304b\u3089\u306e\u30b9\u30c6\u30c3\u30d7\u30a2\u30c3\u30d7\u65b9\u6cd5<\/strong>\u306a\u3069\u306e\u3054\u76f8\u8ac7\u3092\u53d7\u3051\u4ed8\u3051\u3066\u3044\u307e\u3059\u3002<br>\n\u304a\u6c17\u8efd\u306b\u304a\u554f\u5408\u305b\u304f\u3060\u3055\u3044\u3002<div class=\"center\"><p>  <a href=\"\/contact\" class=\"btn raised accent-bc strong\">\u304a\u554f\u5408\u305b\u306f\u3053\u3061\u3089<\/a><\/p><\/div><\/div><\/div>","protected":false},"excerpt":{"rendered":"<p>\u3042\u308b\u65e5\u3001\u3044\u308d\u3044\u308d\u3068\u524a\u9664\u3057\u305f\u308a\u5909\u66f4\u3057\u305f\u308a\u3068\u3057\u3066\u3001master\u306b\u30de\u30fc\u30b8\u3057\u3066push \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3067\u3001pull\u3057\u305f\u3089\u3001 # On branch master # Changes not staged for commit: &#8230; <\/p>\n","protected":false},"author":2,"featured_media":1749,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[54],"tags":[],"class_list":{"0":"post-1748","1":"post","2":"type-post","3":"status-publish","4":"format-standard","5":"has-post-thumbnail","7":"category-programing"},"_links":{"self":[{"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/posts\/1748","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/comments?post=1748"}],"version-history":[{"count":3,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/posts\/1748\/revisions"}],"predecessor-version":[{"id":2308,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/posts\/1748\/revisions\/2308"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/media\/1749"}],"wp:attachment":[{"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/media?parent=1748"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/categories?post=1748"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/adan.jp.net\/blog\/wp-json\/wp\/v2\/tags?post=1748"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}