{"id":9419,"date":"2020-03-04T05:08:42","date_gmt":"2020-03-03T20:08:42","guid":{"rendered":"http:\/\/www.code-magagine.com\/?p=9419"},"modified":"2023-05-27T18:57:18","modified_gmt":"2023-05-27T09:57:18","slug":"%e3%80%90git%e3%80%91%e3%83%95%e3%82%a1%e3%82%a4%e3%83%ab%e3%81%b8%e3%81%ae%e5%a4%89%e6%9b%b4%e3%82%92%e5%8f%96%e3%82%8a%e6%b6%88%e3%81%99","status":"publish","type":"post","link":"http:\/\/www.code-magagine.com\/?p=9419","title":{"rendered":"\u3010Git\u3011\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059"},"content":{"rendered":"<h2>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\u3002<\/h2>\n<pre class=\"lang:default decode:true\">git checkout -- \u30d5\u30a1\u30a4\u30eb\u540d\u307e\u305f\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d1\u30b9<\/pre>\n<p>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3078\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<span style=\"color: #ff0000;\"><strong>\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u307e\u3067\u5fa9\u5143<\/strong><\/span>\u3067\u304d\u307e\u3059\u3002<\/p>\n<h3>\u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059<\/h3>\n<pre class=\"lang:default decode:true \">git checkout -- .<\/pre>\n<h3>--\u3092\u4ed8\u3051\u3066\u3044\u308b\u7406\u7531<\/h3>\n<p>\u300cgit checkout\u30b3\u30de\u30f3\u30c9\u300d\u306f\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u306b\u3082\u4f7f\u3046\u30b3\u30de\u30f3\u30c9\u306b\u306a\u308b\u306e\u3067<span style=\"color: #ff0000;\"><strong>\u30d5\u30a1\u30a4\u30eb\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057\u3068\u533a\u5225\u3059\u308b\u305f\u3081<\/strong><\/span>\u306b\u4ed8\u3051\u307e\u3059\u3002<\/p>\n<h3>\u88cf\u5074\u3067\u8d77\u304d\u3066\u3044\u308b\u52d5\u4f5c<\/h3>\n<p>\u300c\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306e\u60c5\u5831\u300d\u3092\u300c\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u300d\u306b\u6301\u3063\u3066\u304d\u3066\u4e0a\u66f8\u304d\u3057\u3066\u3044\u307e\u3059\u3002\uff08\u306a\u306e\u3067\u3001git add\u3067\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u306b\u95a2\u3057\u3066\u306f\u5143\u306b\u623b\u3059\u3053\u3068\u304c\u53ef\u80fd\u306b\u306a\u308a\u307e\u3059\u3002\uff09<\/p>\n<h2>\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u306b\u8ffd\u52a0\u3057\u305f\u5909\u66f4\u3092\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3078\u623b\u3059\u3002<\/h2>\n<pre class=\"lang:default decode:true\">git reset HEAD \u30d5\u30a1\u30a4\u30eb\u540d<\/pre>\n<p><span style=\"color: #ff0000;\"><strong>\u300cgit add\u300d<\/strong><\/span>\u3092\u53d6\u308a\u6d88\u3057\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u3092\u5fa9\u5143\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002HEAD\u3092\u4ed8\u3051\u308b\u3068\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u3092<span style=\"color: #ff0000;\"><strong>\u6700\u65b0\u306e\u30b3\u30df\u30c3\u30c8\u72b6\u614b\u306b\u623b\u3059<\/strong><\/span>\u3068\u3044\u3046\u610f\u5473\u306b\u306a\u308a\u307e\u3059\u3002\u306a\u304a\u3001\u3042\u304f\u307e\u3067\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u306e\u5185\u5bb9\u3092\u6700\u65b0\u306b\u623b\u3059\u3060\u3051\u3067<span style=\"color: #ff0000;\"><strong>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u5185\u5bb9\u306f\u5168\u304f\u5f71\u97ff\u306f\u306a\u3044<\/strong><\/span>\u306e\u3067\u305d\u306e\u8fba\u306f\u8a8d\u8b58\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>\u306a\u304a\u3001\u300cgit reset\u30b3\u30de\u30f3\u30c9\u300d\u306b\u306f<span style=\"color: #ff0000;\"><strong>\u30b3\u30df\u30c3\u30c8\u81ea\u4f53\u3092\u53d6\u308a\u6d88\u3059\u6a5f\u80fd\u3082\u3042\u308a\u307e\u3059\u304c\u3001\u5f8c\u3067\u554f\u984c\u304c\u8d77\u304d\u308b\u53ef\u80fd\u6027\u304c\u3042\u308b\u306e\u3067\u305d\u306e\u6a5f\u80fd\u306f\u4f7f\u308f\u306a\u3044\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/strong><\/span><\/p>\n<h3>HEAD\u3068\u306f\uff1f<\/h3>\n<p>\u4eca\u6240\u5c5e\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3057\u307e\u3059\u3002\u8a73\u3057\u304f\u306f\u4e0b\u8a18\u3067\u3082\u89e3\u8aac\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<blockquote class=\"wp-embedded-content\" data-secret=\"LBYz2ywn8p\"><p><a href=\"http:\/\/www.code-magagine.com\/?p=7308\">\u3010Git\u3011\u300cHEAD\u300d\u3063\u3066\u4f55\uff1f<\/a><\/p><\/blockquote>\n<p><iframe class=\"wp-embedded-content\" sandbox=\"allow-scripts\" security=\"restricted\" style=\"position: absolute; clip: rect(1px, 1px, 1px, 1px);\" src=\"http:\/\/www.code-magagine.com\/?p=7308&#038;embed=true#?secret=LBYz2ywn8p\" data-secret=\"LBYz2ywn8p\" width=\"500\" height=\"282\" title=\"&#8220;\u3010Git\u3011\u300cHEAD\u300d\u3063\u3066\u4f55\uff1f&#8221; &#8212; \u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30de\u30ac\u30b8\u30f3\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\"><\/iframe><\/p>\n<h3>\u524d\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u5834\u5408<\/h3>\n<pre class=\"lang:default decode:true\">git reset HEAD .<\/pre>\n<h2>\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u5834\u5408<\/h2>\n<h3>\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u5834\u5408<\/h3>\n<p>\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068<span style=\"color: #ff0000;\"><strong>\u4eca\u306e\u30b9\u30c6\u30fc\u30b8\u306e\u5185\u5bb9\u3067\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u308a\u76f4\u3059\u52d5\u4f5c<\/strong><\/span>\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true \">git commit --amend<\/pre>\n<h3>\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u5834\u5408<\/h3>\n<p>\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3092\u6253\u3064\u3068\u30a8\u30c7\u30a3\u30bf\u304c\u7acb\u3061\u4e0a\u304c\u3063\u3066\u4fee\u6b63\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u304cpick\u3068\u3044\u3046\u5f62\u3067\u7acb\u3061\u4e0a\u304c\u308a\u307e\u3059\u3002\u3082\u3057\u3001\u4fee\u6b63\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u3067\u3042\u308c\u3070pick\u3092edit\u3068\u3044\u3046\u6587\u5b57\u5217\u306b\u4fee\u6b63\u3057\u307e\u3059\u3002\u305d\u306e\u5f8c\u4fee\u6b63\u3092\u5b9f\u65bd\u3057\u3066\u4fee\u6b63\u304c\u5b8c\u4e86\u3057\u305f\u3089\u300cgit commit --amend\u300d\u53ca\u3073\u300cgit rebase --continue\u300d\u7b49\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3063\u3066\u30b3\u30df\u30c3\u30c8\u306e\u4fee\u6b63\u306e\u78ba\u5b9a\u53ca\u3073\u3001\u5225\u306e\u30b3\u30df\u30c3\u30c8\u3078\u306e\u79fb\u52d5\u7b49\u3092\u884c\u3044\u307e\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true\">git rebase -i &lt;\u30b3\u30df\u30c3\u30c8ID&gt; \u3082\u3057\u304f\u306f HEAD~(\u3084\u308a\u76f4\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u6570)<\/pre>\n<h4>\u3084\u308a\u76f4\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u6570<\/h4>\n<p>\u4f8b\u3048\u3070\u3001\u76f4\u524d3\u56de\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3084\u308a\u76f4\u3057\u305f\u3044\u3068\u3044\u3046\u3053\u3068\u3067\u3042\u308c\u3070<span style=\"color: #ff0000;\"><strong>\u300cgit rebase -i HEAD~3\u300d<\/strong><\/span>\u3068\u8a18\u8ff0\u3057\u307e\u3059\u3002<\/p>\n<h4>\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u4fee\u6b63\u3092\u5b9f\u884c\u3059\u308b\u3002<\/h4>\n<pre class=\"lang:default decode:true\">git commit --amend<\/pre>\n<h4>\u4ed6\u306e\u4fee\u6b63\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u308b\u3002<\/h4>\n<p>\u3082\u3057\u3001\u4ed6\u306b\u4fee\u6b63\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u304c\u306a\u3051\u308c\u3070\uff08\u5168\u3066pick\u3068\u304b\u306b\u306a\u3063\u3066\u3044\u308c\u3070\uff09\u30b3\u30de\u30f3\u30c9\u81ea\u4f53\u304c\u7d42\u4e86\u3057\u307e\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true\">git rebase --continue<\/pre>\n<h3>\u6ce8\u610f\u70b9<\/h3>\n<p><span style=\"color: #ff0000;\"><strong>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306bPush\u3057\u3066\u3057\u307e\u3063\u305f\u30b3\u30df\u30c3\u30c8\u306b\u95a2\u3057\u3066\u306f\u3084\u308a\u76f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002<\/strong><span style=\"color: #000000;\">\u7406\u7531\u3068\u3057\u3066\u306f\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306bPush\u3057\u305f\u5185\u5bb9\u306f\u4ed6\u306e\u8ab0\u304b\u304c\u5909\u66f4\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u3093\u3067\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308b\u305f\u3081\u3067\u3059\u3002<\/span><\/span><\/p>\n<h3>\u3059\u3067\u306bPush\u3057\u305f\u5185\u5bb9\u3092\u3084\u308a\u76f4\u3059\u5834\u5408\u306f\u3069\u3046\u3059\u308c\u3070\u826f\u3044\u304b\u3002<\/h3>\n<p>\u53d6\u308a\u6d88\u3059\u3053\u3068\u306f\u3067\u304d\u306a\u3044\u306e\u3067<span style=\"color: #ff0000;\"><strong>--amend\u3092\u4f7f\u308f\u305a\u306b\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3068\u3057\u3066\u4fee\u6b63\u3059\u308b<\/strong><\/span>\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<h2>\u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5<\/h2>\n<h3>\u30b3\u30de\u30f3\u30c9<\/h3>\n<p>\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u5909\u66f4\u3055\u308c\u3066\u304b\u3064\u30b9\u30c6\u30fc\u30b8\u306b\u3082\u53cd\u6620\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true\">git mv &lt;\u65e7\u30d5\u30a1\u30a4\u30eb&gt; &lt;\u65b0\u30d5\u30a1\u30a4\u30eb&gt;<\/pre>\n<h4>\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3067\u4ee3\u7528\u306f\u53ef\u80fd<\/h4>\n<p>\u901a\u5e38\u306eLinux\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3063\u3066\u3082\u4ee3\u66ff\u306f\u53ef\u80fd\u306a\u306e\u3067\u3069\u3061\u3089\u3092\u4f7f\u3063\u3066\u3082\u5927\u4e08\u592b\u3067\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true \">mv &lt;\u65e7\u30d5\u30a1\u30a4\u30eb&gt; &lt;\u65b0\u30d5\u30a1\u30a4\u30eb&gt;\r\ngit rm &lt;\u65e7\u30d5\u30a1\u30a4\u30eb&gt;\r\ngit add &lt;\u65b0\u30d5\u30a1\u30a4\u30eb&gt;<\/pre>\n<h2>\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664<\/h2>\n<h3>Git\u7ba1\u7406\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u3084\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u524a\u9664\u3059\u308b\u3002<\/h3>\n<pre class=\"lang:default decode:true\">git rm \u30d5\u30a1\u30a4\u30eb\u540d<\/pre>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u3068\u30d5\u30a1\u30a4\u30eb\u3092\u7269\u7406\u7684\u306b\u524a\u9664\u3092\u3057\u3066\u305d\u306e\u60c5\u5831\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u306b\u767b\u9332\u3057\u307e\u3059\u3002\u305d\u306e\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3092\u3059\u308b\u3053\u3068\u3067\u524a\u9664\u4f5c\u696d\u304c\u5b8c\u4e86\u3057\u307e\u3059\u3002<\/p>\n<h4>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u524a\u9664\u3057\u305f\u3044\u5834\u5408<\/h4>\n<pre class=\"lang:default decode:true\">git rm -r \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d1\u30b9<\/pre>\n<p>\u4e2d\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u300c-r\u300d\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002<span style=\"color: #ff0000;\"><strong>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u3082\u5168\u3066\u524a\u9664\u3092\u3057\u3066\u304f\u308c\u307e\u3059\u3002<\/strong><\/span><\/p>\n<h4>Git\u306e\u8a18\u9332\u304b\u3089\u306e\u307f\u30d5\u30a1\u30a4\u30eb\u3092\u6b8b\u3057\u305f\u3044\u5834\u5408<\/h4>\n<pre class=\"lang:default decode:true\">git rm --cached &lt;\u30d5\u30a1\u30a4\u30eb\u540d&gt;<\/pre>\n<p>\u3053\u308c\u3092\u4f7f\u3046\u3068Git\u306e\u5c65\u6b74\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u306f\u6d88\u3048\u307e\u3059\u304c\u3001<span style=\"color: #ff0000;\"><strong>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u306f\u30d5\u30a1\u30a4\u30eb\u304c\u6b8b\u308a\u307e\u3059\u3002<\/strong><\/span><\/p>\n<h5>\u7528\u9014<\/h5>\n<p>\u300c\u30d1\u30b9\u30ef\u30fc\u30c9\u4ed8\u304d\u306e\u30d5\u30a1\u30a4\u30eb\u300d\u3092\u7ba1\u7406\u3059\u308b\u5834\u5408\u3068\u304b\u306b\u4f7f\u3048\u307e\u3059\u3002\uff08\u30ea\u30dd\u30b8\u30c8\u30ea\u7ba1\u7406\u5bfe\u8c61\u5916\u304b\u3089\u306f\u5916\u3057\u305f\u3044\u3067\u3059\u304c\u30ed\u30fc\u30ab\u30eb\u306b\u306f\u6b8b\u3057\u3066\u304a\u304d\u305f\u3044\u3002\uff09<\/p>\n","protected":false},"excerpt":{"rendered":"\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\u3002 git checkout -- \u30d5\u30a1\u30a4\u30eb\u540d\u307e\u305f\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d1\u30b9 \u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3078\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u307e\u3067\u5fa9\u5143\u3067\u304d\u307e\u3059\u3002 \u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059 git checko [&hellip;]","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[32],"tags":[],"_links":{"self":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/9419"}],"collection":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=9419"}],"version-history":[{"count":21,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/9419\/revisions"}],"predecessor-version":[{"id":20187,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/9419\/revisions\/20187"}],"wp:attachment":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=9419"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=9419"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=9419"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}