{"id":8856,"date":"2015-12-23T09:30:52","date_gmt":"2015-12-23T00:30:52","guid":{"rendered":"http:\/\/www.techscore.com\/blog\/?p=8856"},"modified":"2018-11-14T16:33:46","modified_gmt":"2018-11-14T07:33:46","slug":"git-%e5%9b%b0%e3%81%a3%e3%81%9f%e3%81%a8%e3%81%8d%e3%81%aetips%e9%9b%86","status":"publish","type":"post","link":"https:\/\/www.techscore.com\/blog\/2015\/12\/23\/git-%e5%9b%b0%e3%81%a3%e3%81%9f%e3%81%a8%e3%81%8d%e3%81%aetips%e9%9b%86\/","title":{"rendered":"Git \u56f0\u3063\u305f\u3068\u304d\u306etips\u96c6"},"content":{"rendered":"<p>\u3053\u3093\u306b\u3061\u306f\u3001\u5e73\u5965\u3067\u3059\uff01<\/p>\n<p>\u3053\u308c\u306f<a href=\"https:\/\/www.techscore.com\/blog\/2015\/11\/30\/techscore-advent-calendar-2015\/\" target=\"_blank\">TECHSCORE Advent Calendar 2015<\/a>\u306e23\u65e5\u76ee\u306e\u8a18\u4e8b\u3067\u3059\u3002<\/p>\n<h2>\u306f\u3058\u3081\u306b<\/h2>\n<p>\u958b\u767a\u3067\u30bd\u30fc\u30b9\u306e\u7ba1\u7406\u3092\u3059\u308b\u306e\u306b\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u306e<strong>Git<\/strong>\u3092\u4f7f\u3046\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002<br \/>\n\u306f\u3058\u3081\u306f\u6163\u308c\u3066\u3044\u306a\u3044\u306e\u3067\u3001<strong>git add<\/strong>\u3057\u3066<strong>git commit<\/strong>\u3057\u3066<strong>git push<\/strong>\u3059\u308b\u3068\u3044\u3046\u3088\u3046\u306a\u57fa\u672c\u7684\u306a\u64cd\u4f5c\u3057\u304b\u305b\u305a\u3001\u307e\u305f\u614e\u91cd\u306b\u884c\u3046\u306e\u3067\u5927\u304d\u306a\u5931\u6557\u306f\u5c11\u306a\u3044\u3067\u3059\u3002\u3057\u304b\u3057\u6163\u308c\u3066\u304f\u308b\u3068\u305d\u3046\u306f\u3044\u304d\u307e\u305b\u3093\u3002<\/p>\n<p>\u300c\u3048\u3063\u3001\u4f55\u3067\u3053\u30fc\u306a\u308b\u306e\uff1f\u300d<br \/>\n\u300c\u3042\u3063\u3001\u9593\u9055\u3048\u3061\u3083\u3063\u305f\u2026\u300d<\/p>\n<p>\u305d\u3046\u3044\u3046\u3053\u3068\u591a\u3005\u3042\u308a\u307e\u305b\u3093\u304b\uff1f\uff1f<br \/>\n\u305d\u3046\u3044\u3046\u5834\u9762\u306b\u51fa\u304f\u308f\u3057\u305f\u5834\u5408\u306b\u3001\u624b\u52a9\u3051\u3067\u304d\u308b\u3088\u3046\u306a\u5185\u5bb9\u3092\u66f8\u304d\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<h2>Git\u306e\u57fa\u672c\u6982\u5ff5<\/h2>\n<p>\u307e\u305a\u306f\u6700\u4f4e\u9650\u306e\u57fa\u672c\u6982\u5ff5\uff01\uff01\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u601d\u60f3\u3068\u632f\u308b\u821e\u3044\u3092\u77e5\u308b\u3053\u3068\u304c\u4e00\u756a\u306e\u4e0a\u9054\u306e\u8fd1\u9053\u3060\u3068\u601d\u3044\u307e\u3059\u306e\u3067\u62bc\u3055\u3048\u3066\u304a\u304f\u3079\u304d\u3067\u3059\uff01\uff01<\/p>\n<h3>\u7528\u8a9e\u89e3\u8aac<\/h3>\n<p>\u306f\u3058\u3081\u306b\u7528\u8a9e\u3092\u8aac\u660e\u3057\u307e\u3059\u3002<\/p>\n<h4>\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u306f<\/h4>\n<p>\u30d5\u30a1\u30a4\u30eb\u3084\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u72b6\u614b\u3092\u8a18\u9332\u3059\u308b\u5834\u6240\u3067\u3059\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u958b\u59cb\u4ee5\u6765\u306e\u3001\u3059\u3079\u3066\u306e\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u96c6\u3081\u3066\u8a18\u9332\u3057\u3066\u3044\u308b\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u547c\u3073\u307e\u3059\u3002<\/p>\n<h4>\u30ea\u30d3\u30b8\u30e7\u30f3\u3001\u30b3\u30df\u30c3\u30c8<\/h4>\n<p>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u72b6\u614b\u3092\u8a18\u9332\u3057\u305f\u4e00\u3064\u306e\u5358\u4f4d\u3092\u3001\u30ea\u30d3\u30b8\u30e7\u30f3\u3068\u304b\u30b3\u30df\u30c3\u30c8\u3068\u304b\u8a00\u3046\u8a00\u8449\u3067\u8868\u3057\u307e\u3059\u3002\u30ea\u30d3\u30b8\u30e7\u30f3\u3068\u30b3\u30df\u30c3\u30c8\u306e\u9055\u3044\u306f\u3042\u308b\u3088\u3046\u3067\u3059\u304c\u3001\u610f\u5473\u5408\u3044\u306f\u30ea\u30d3\u30b8\u30e7\u30f3\uff1d\u30b3\u30df\u30c3\u30c8\u3067\u8003\u3048\u3066\u3044\u3066\u3082\u554f\u984c\u306a\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<h4>\u30d6\u30e9\u30f3\u30c1<\/h4>\n<p>\u30d6\u30e9\u30f3\u30c1\u3068\u306f\u3001\u30b3\u30df\u30c3\u30c8\u306e\u5c65\u6b74\u306e\u6d41\u308c\u3092\u8a18\u9332\u3057\u305f\u3082\u306e\u3067\u3059\u3002\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3057\u793a\u3059\u3053\u3068\u306b\u3088\u3063\u3066\u3001\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u73fe\u5728\u306e\u72b6\u614b\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u6b74\u53f2\u306e\u4e2d\u306b\u304a\u3051\u308b\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u4f4d\u7f6e\u3065\u3051\u3092\u8a18\u9332\u3057\u305f\u308a\u3001\u5909\u66f4\u3092\u3057\u305f\u5834\u5408\u306b\u6b21\u306b\u4f5c\u3089\u308c\u308b\u30b3\u30df\u30c3\u30c8\u304c\u3069\u3053\u306b\u4f5c\u3089\u308c\u308b\u304b\u3092\u793a\u3059\u305f\u3081\u306b\u4f7f\u308f\u308c\u307e\u3059\u3002<\/p>\n<p><img src=\"https:\/\/www.techscore.com\/blog\/wp\/wp-content\/uploads\/2015\/12\/ce40d7ecc035df5b754928fb8e11f4f4.png\"><\/p>\n<p><strong>fix-A<\/strong>\u3068\u304b<strong>feature-B<\/strong>\u3068\u304b\u306e\u77e2\u5370\u304c\u305d\u308c\u305e\u308c\u306e\u5148\u982d\u306e\u72b6\u614b\u3092\u6307\u3057\u793a\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3057\u793a\u3057\u305f\u77e2\u5370\u3092\u3001\u30d6\u30e9\u30f3\u30c1\u3068\u547c\u3073\u307e\u3059\u3002<\/p>\n<h4>\u30a4\u30f3\u30c7\u30c3\u30af\u30b9<\/h4>\n<p>\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u30b3\u30df\u30c3\u30c8\u3059\u308b\u305f\u3081\u306e\u60c5\u5831\u3092\u6e96\u5099\u3059\u308b\u305f\u3081\u306e\u3082\u306e\u306b\u306a\u308a\u307e\u3059\u3002\u5177\u4f53\u7684\u306b\u306f\u5909\u66f4\u5185\u5bb9\u3092<strong>git add<\/strong>\u306a\u3069\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30b3\u30df\u30c3\u30c8\u5bfe\u8c61\u306b\u3057\u307e\u3059\u304c\u3001\u305d\u306e\u30b3\u30df\u30c3\u30c8\u5bfe\u8c61\u3092\u7ba1\u7406\u3059\u308b\u3082\u306e\u304c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u306a\u308a\u307e\u3059\u3002\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u30b9\u30c6\u30fc\u30b8\u3068\u3044\u3046\u8a00\u3044\u65b9\u3082\u3055\u308c\u307e\u3059\u3002<\/p>\n<h4>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc<\/h4>\n<p>\u30ea\u30d3\u30b8\u30e7\u30f3\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u308b\u5185\u5bb9\u3092\u5c55\u958b\u3057\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u9818\u57df\u3092\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3068\u547c\u3073\u307e\u3059\u3002<strong>git checkout<\/strong>\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u304c\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u9818\u57df\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3059\u304c\u3001\u305d\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u9818\u57df\u306e\u3053\u3068\u3092\u6307\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<h2>tips\u96c6<\/h2>\n<p>\u305d\u308c\u3067\u306f\u4ee5\u4e0b\u306b\u4f8b\u3092\u3042\u3052\u3066\u5bfe\u51e6\u6cd5\u3092\u66f8\u3044\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n<hr \/>\n<h3>\u30fb\u30ed\u30b0\u30e1\u30c3\u30bb\u30fc\u30b8\u306b\u5909\u306a\u3053\u3068\u3092\u66f8\u3044\u3066\u3057\u307e\u3063\u305f\u3002\u30b3\u30df\u30c3\u30c8\u306b\u8ffd\u52a0\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u5fd8\u308c\u3066\u3044\u305f<\/h3>\n<p>\u30ed\u30b0\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4f55\u3082\u66f8\u304b\u305a\u306b<strong>commit<\/strong>\u3057\u305f\u308a\u3001\u6065\u305a\u304b\u3057\u3044\u3053\u3068\u3092\u66f8\u3044\u305f\u308a\u3059\u308b\u3053\u3068\u305f\u307e\u306b\u3042\u308a\u307e\u3059\u3088\u306d\u3002<br \/>\n\u305d\u3093\u306a\u6642\u306f\u3001<\/p>\n<pre>git commit --amend<\/pre>\n<p>\u3067\u30ed\u30b0\u3092\u66f8\u304d\u63db\u3048\u3066\u3057\u307e\u3044\u307e\u3057\u3087\u3046\u3002<br \/>\n\u3061\u306a\u307f\u306b\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u30b3\u30df\u30c3\u30c8\u3092\u3084\u308a\u76f4\u3059\u30b3\u30de\u30f3\u30c9\u3067\u3059\u306e\u3067\u3001\u4f8b\u3048\u3070\u30b3\u30df\u30c3\u30c8\u306b\u8ffd\u52a0\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u5fd8\u308c\u3066\u3044\u305f\u5834\u5408<\/p>\n<pre>git add hoge.js\r\ngit commit --amend<\/pre>\n<p>\u3067\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u4fee\u6b63\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<hr \/>\n<h3>\u30fb\u4e00\u6c17\u306b\u3044\u308d\u3093\u306a\u4fee\u6b63\u3092\u3057\u3066\u3057\u307e\u3063\u305f\u304c\u3001\u305d\u308c\u305e\u308c\u5225\u3005\u306b\u30b3\u30df\u30c3\u30c8\u306b\u3057\u3066\u5c65\u6b74\u3092\u6b8b\u3057\u305f\u3044<\/h3>\n<pre>git add -p<\/pre>\n<p>\u3092\u4f7f\u3063\u3066\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u66f4\u65b0\u3059\u308b\u3002<br \/>\n\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u3068\u3001\u5909\u66f4\u7b87\u6240\u3092\u5bfe\u8a71\u5f62\u5f0f\u3067\u78ba\u8a8d\u3057\u3066\u304f\u308c\u3066\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3059\u308b\u304b\u306e\u9078\u629e\u3092\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br \/>\n\uff11\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u3067\u3042\u3063\u3066\u3082\u90e8\u5206\u7684\u306b\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u3067\u3059\u306e\u3067\u4eca\u56de\u306e\u30b3\u30df\u30c3\u30c8\u3067\u306fA\u306e\u4fee\u6b63\u5206\u3060\u3051\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u53cd\u6620\u3057\u3066\u3001\u6b21\u56de\u306e\u30b3\u30df\u30c3\u30c8\u3067\u306fB\u306e\u4fee\u6b63\u5206\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u53cd\u6620\u3057\u3066\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3068\u3044\u3046\u3088\u3046\u306a\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u307e\u305f\u3001\u305f\u3068\u3048\u3070\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306a\u3069\u3092\u5b9f\u88c5\u3057\u3066\u3044\u3066\u3001\u30c6\u30b9\u30c8\u30b3\u30fc\u30c9\u306f\u30b3\u30df\u30c3\u30c8\u3057\u305f\u304f\u306a\u3044\u3068\u304b\u3001\u9593\u9055\u3063\u305f\u4fee\u6b63\u3092\u30b3\u30df\u30c3\u30c8\u3057\u306a\u3044\u3088\u3046\u306b\u4fee\u6b63\u5185\u5bb9\u3092\u78ba\u8a8d\u3057\u306a\u304c\u3089\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3057\u305f\u3044\u306a\u3069\u306e\u7528\u9014\u306b\u3082\u4f7f\u3048\u307e\u3059\u3002<\/p>\n<hr \/>\n<h3>\u30fb\u30ed\u30fc\u30ab\u30eb\u3067\u7de8\u96c6\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u5143\u306b\u623b\u3057\u305f\u3044<\/h3>\n<pre>git checkout <fileName><\/pre>\n<p>\u30d5\u30a1\u30a4\u30eb\u3092\u4fee\u6b63\u3057\u3066\u3044\u3066\u3001\u3084\u3063\u3071\u308a\u5143\u306b\u623b\u3057\u305f\u3044\u5834\u5408\u306b\u4f7f\u3044\u307e\u3059\u3002\u307e\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u66ff\u3048\u308b\u3068\u304d\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u3066\u3044\u305f\u6642\u306f\u5207\u308a\u66ff\u3048\u3089\u308c\u306a\u3044\u306e\u3067\u3059\u304c\u3001<strong>git stash<\/strong>\u3067\u9000\u907f\u3059\u308b\u307e\u3067\u3082\u306a\u3044\u4fee\u6b63\u3084\u8981\u3089\u306a\u3044\u4fee\u6b63\u306e\u5834\u5408\u306f\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3063\u3066\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3057\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u66ff\u3048\u305f\u308a\u3057\u307e\u3059\u3002<\/p>\n<p>\u307e\u305f<strong>git add<\/strong>\u3067\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u66f4\u65b0\u3057\u3066\u3057\u307e\u3063\u3066\u3044\u308b\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u5909\u66f4\u5185\u5bb9\u3082\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u306e\u72b6\u614b\u306b\u623b\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre>git reset --hard HEAD<\/pre>\n<p>\u305d\u3082\u305d\u3082<strong>git reset<\/strong>\u306b\u306f\u30aa\u30d7\u30b7\u30e7\u30f3\u3067<strong>--soft<\/strong>\u3001<strong>--mixed<\/strong>(\u30aa\u30d7\u30b7\u30e7\u30f3\u306a\u3057)\u3001<strong>--hard<\/strong>\u3068\u3042\u308b\u306e\u3067\u3059\u304c\u3001\u3069\u3046\u9055\u3046\u306e\u304b\u3002<br \/>\n<strong>--soft<\/strong>\u306f\u4eca\u307e\u3067\u306e\u304a\u3053\u306a\u3063\u3066\u304d\u305f\u30b3\u30df\u30c3\u30c8\u306e\u307f\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u307e\u3059<br \/>\n<strong>--mixed<\/strong>(\u30aa\u30d7\u30b7\u30e7\u30f3\u306a\u3057)\u306f\u30b3\u30df\u30c3\u30c8\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u5bfe\u3057\u3066\u304a\u3053\u306a\u3063\u305f\u5909\u66f4\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u307e\u3059\u3002<br \/>\n<strong>--hard<\/strong>\u306f\u30b3\u30df\u30c3\u30c8\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u5909\u66f4\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u5bfe\u3057\u3066\u884c\u3063\u305f\u5909\u66f4\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u307e\u3059\u3002<\/p>\n<p>\u7528\u9014\u306b\u5fdc\u3058\u3066\u4f7f\u3044\u5206\u3051\u3066\u3082\u3089\u3048\u3070\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<p>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u8981\u3089\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3084\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u3059\u3063\u304d\u308a\u524a\u9664\u3057\u305f\u3044\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002<\/p>\n<pre>git clean -xfd\r\ngit clean -xf<\/pre>\n<p><strong>-x<\/strong>\u30aa\u30d7\u30b7\u30e7\u30f3\u306f<strong>git<\/strong>\u3067\u901a\u5e38\u306f\u7121\u8996\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u3082\u524a\u9664\u3057\u307e\u3059\u3002<br \/>\n<strong>-f<\/strong>\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3059\u308b\u3068\u304d\u306b\u6307\u5b9a\u3057\u307e\u3059\u3002<strong>--force<\/strong>\u306e\u7565\u3067\u3059\u3002<br \/>\n<strong>-d<\/strong>\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u8ffd\u8de1\u3055\u308c\u3066\u3044\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u52a0\u3048\u3001\u8ffd\u8de1\u3055\u308c\u3066\u3044\u306a\u3044\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3082\u524a\u9664\u3057\u307e\u3059\u3002<\/p>\n<hr \/>\n<h3>\u30fb\u5fc5\u8981\u306a\u30d6\u30e9\u30f3\u30c1\u3001\u30b3\u30df\u30c3\u30c8\u3092\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u5834\u5408<\/h3>\n<p>\u4e0a\u8a18\u3067\u7d39\u4ecb\u3057\u305f<strong>git reset<\/strong>\u3067\u9593\u9055\u3048\u3066\u5fc5\u8981\u306a\u30b3\u30df\u30c3\u30c8\u3092\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u5143\u306b\u623b\u305b\u307e\u3059\u3002<\/p>\n<pre>git reflog<\/pre>\n<p>\u3067\u307e\u305a\u30b3\u30df\u30c3\u30c8\u4e00\u89a7\u3092\u78ba\u8a8d\u3001\u305d\u3057\u3066<\/p>\n<pre>git reset --hard <commitID><\/pre>\n<p>\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n<p><strong>git reflog<\/strong>\u306f\u904e\u53bb\u306e\u3042\u3089\u3086\u308b\u30b3\u30df\u30c3\u30c8\u3092\u53c2\u7167\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u30d6\u30e9\u30f3\u30c1\u3092\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u3068\u304d\u306f<\/p>\n<pre>git reset --hard <branchName><commitID><\/pre>\n<p>\u3067\u5143\u306b\u623b\u305b\u307e\u3059\u3002<\/p>\n<hr \/>\n<h3>\u30fb\u30d6\u30e9\u30f3\u30c1\u9593\u306e\u6bd4\u8f03\u3092\u3057\u305f\u3044<\/h3>\n<p>A\u30d6\u30e9\u30f3\u30c1\u306b\u306fB\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u6d3e\u751f\u3057\u3066C\u4fee\u6b63\u3092\u52a0\u3048\u3066\u3044\u308b\u306f\u305a\u306a\u306e\u3067\u3001\u5dee\u5206\u306fC\u4fee\u6b63\u306e\u306f\u305a\u3060\u3051\u3069\u3001\u78ba\u8a8d\u3059\u308b\u65b9\u6cd5\u306f\u306a\u3044\u304b\u306a\u3068\u601d\u3046\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u305d\u3046\u3044\u3046\u6642\u306f<\/p>\n<pre>git diff 'A\u30d6\u30e9\u30f3\u30c1' 'B\u30d6\u30e9\u30f3\u30c1'<\/pre>\n<p>\u3067\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u3053\u308c\u306f\u6b63\u78ba\u306b\u306f\u30b3\u30df\u30c3\u30c8\u9593\u306e\u6bd4\u8f03\u306b\u306a\u308a\u307e\u3059\u3002<br \/>\n\u3067\u3059\u306e\u3067\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30b3\u30df\u30c3\u30c8\u9593\u306e\u6bd4\u8f03\u3082\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre>git log<\/pre>\n<p>\u30b3\u30df\u30c3\u30c8ID\u306e\u53d6\u5f97\u3092\u3057\u307e\u3059\u3002<\/p>\n<pre>git diff <commitID-A> <commitID-B><\/pre>\n<hr \/>\n<h3>\u30fb\u4fee\u6b63\u3057\u3066\u3044\u305f\u30d6\u30e9\u30f3\u30c1\u304c\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u9055\u3063\u3066\u3044\u305f<\/h3>\n<p>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3084\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u3057\u305f\u5909\u66f4\u306f\u9593\u9055\u3044\u3067\u306f\u306a\u304f\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u66ff\u3048\u308b\u306e\u3092\u5fd8\u308c\u3066\u3044\u3066\u3001\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u306f\u9055\u3046\u30d6\u30e9\u30f3\u30c1\u306b\u4fee\u6b63\u3092\u884c\u3063\u3066\u3044\u305f\u3063\u3066\u3053\u3068\u3088\u304f\u3042\u308a\u307e\u3059\u3002\u305d\u3046\u3044\u3046\u5834\u5408\u306e\u89e3\u6c7a\u65b9\u6cd5\u306f\u3001\u307e\u305a\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u8a66\u3057\u307e\u3059\u3002<\/p>\n<pre>git checkout <branch><\/pre>\n<p><strong>branch<\/strong>\u306f\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<p>\u3082\u3057\u3053\u306e\u30b3\u30de\u30f3\u30c9\u304c\u6210\u529f\u3057\u3066\u3001\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3092<strong>checkout<\/strong>\u3067\u304d\u305f\u3089\u3001\u4f55\u3082\u60a9\u3080\u3053\u3068\u306f\u3042\u308a\u307e\u305b\u3093\u3002<br \/>\n\u9593\u9055\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u884c\u3063\u305f\u5185\u5bb9\u306f\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u6b63\u3057\u304f\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br \/>\n<strong>Git<\/strong>\u3067\u306f\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u3057\u305f\u5909\u66f4\u306f\u3001\u3069\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u3082\u5c5e\u3057\u3066\u3044\u308b\u3082\u306e\u3067\u306f\u306a\u3044\u306e\u3067\u3001\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u306f\u9055\u3046\u30d6\u30e9\u30f3\u30c1\u306b\u304a\u3053\u306a\u3063\u305f\u5909\u66f4\u304c\u3001\u3053\u3046\u3084\u3063\u3066\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u3063\u3066\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3057\u307e\u3046\u3053\u3068\u304c\u3067\u304d\u308b\u3093\u3067\u3059\u3002<\/p>\n<p>\u3057\u304b\u3057\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30a8\u30e9\u30fc\u304c\u51fa\u308b\u5834\u5408\u3001\u4fee\u6b63\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u304c\u9593\u9055\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u3068\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u3067\u7570\u306a\u3063\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<pre>git checkout <branch>\r\nerror: You have local changes to '\u30d5\u30a1\u30a4\u30eb\u540d'; cannot switch branches.<\/pre>\n<p>\u3053\u3046\u3044\u3046\u5834\u5408\u306e\u5bfe\u51e6\u6cd5\u306f\u3044\u304f\u3064\u304b\u3042\u308a\u307e\u3059\u3002<\/p>\n<h4>\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u59cb\u3081\u3066\u30de\u30fc\u30b8\u3059\u308b<\/h4>\n<p>\u9593\u9055\u3063\u305f\u3068\u5224\u65ad\u3057\u305f\u6642\u70b9\u3067\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u59cb\u3081\u3066\u3057\u3066\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002<\/p>\n<pre>git checkout -b '\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u540d'\r\ngit commit\r\ngit checkout '\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u540d'\r\ngit merge '\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u540d'<\/pre>\n<h4>\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u59cb\u3081\u3066\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u3059\u308b<\/h4>\n<p>\u5148\u307b\u3069\u306e\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u59cb\u3081\u3066\u30de\u30fc\u30b8\u3059\u308b\u306e\u6700\u5f8c\u306e\u624b\u9806\u3067\u30de\u30fc\u30b8\u306e\u4ee3\u308f\u308a\u306b\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u3092\u884c\u3044\u307e\u3059\u3002<br \/>\n\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u3068\u306f\u30d6\u30e9\u30f3\u30c1\u306e\u767b\u9332\u3055\u308c\u305f\u30b3\u30df\u30c3\u30c8\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u9069\u7528\u3059\u308b\u3053\u3068\u3092\u3044\u3044\u307e\u3059\u3002<\/p>\n<pre>git checkout -b '\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u540d'\r\ngit commit\r\ngit log<\/pre>\n<p>git log\u3067\u30b3\u30df\u30c3\u30c8ID\u3092\u53d6\u5f97\u3057\u307e\u3059\u3002<\/p>\n<pre>git checkout '\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u540d'\r\ngit cherry-pick <commitID><\/pre>\n<h4>git stash\u3067\u9000\u907f\u3059\u308b<\/h4>\n<p><strong>git stash<\/strong>\u3092\u4f7f\u3063\u3066\u4eca\u306e\u5909\u66f4\u3092\u9000\u907f\u3055\u305b\u3001\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u5909\u66f4\u3092\u53cd\u6620\u3057\u307e\u3059\u3002<\/p>\n<pre>git stash save<\/pre>\n<p>\u307e\u305a\u306f\u5909\u66f4\u3092\u9000\u907f\u3002<\/p>\n<pre>git checkout '\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1'<\/pre>\n<p>\u76ee\u7684\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3002<\/p>\n<pre>git stash pop<\/pre>\n<p>\u5909\u66f4\u5185\u5bb9\u3092\u53cd\u6620\u3057\u307e\u3059\u3002<\/p>\n<h3>\u30fb\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044<\/h3>\n<p>\u30de\u30fc\u30b8\u3057\u305f\u3051\u3069\u3001\u305d\u306e\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u3002\u305d\u3093\u306a\u6642\u306f<strong>git revert<\/strong>\u3092\u4f7f\u3044\u307e\u3059\u3002<\/p>\n<pre>git merge <branch>\r\ngit commit<\/pre>\n<p>\u30de\u30fc\u30b8\u3092\u884c\u3044\u307e\u3057\u305f\u304c\u3001\u3053\u306e\u6642\u70b9\u3067\u3084\u3063\u3071\u308a\u5143\u306b\u623b\u3057\u305f\u3044\u3002\u3002<\/p>\n<pre>git log<\/pre>\n<p>\u30ed\u30b0\u3067\u30de\u30fc\u30b8\u306e\u30b3\u30df\u30c3\u30c8ID\u3092\u53d6\u5f97<\/p>\n<pre>git revert -m 1or2 <commitID><\/pre>\n<p><strong>-m<\/strong>\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u300c1\u304c\u30de\u30fc\u30b8\u3055\u308c\u305f\u5074\u306e\u30d6\u30e9\u30f3\u30c1\u300d\u300c2\u304c\u30de\u30fc\u30b8\u3059\u308b\u5074\u306e\u30d6\u30e9\u30f3\u30c1\u300d\u3068\u306a\u308a\u307e\u3059\u3002\u591a\u304f\u306e\u5834\u5408\u306f\u30de\u30fc\u30b8\u3055\u308c\u305f\u5074\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u57fa\u306b\u623b\u3059\u3068\u5834\u5408\u304c\u591a\u3044\u306e\u30671\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u591a\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<h2>\u307e\u3068\u3081<\/h2>\n<p>\u4eca\u307e\u3067\u66f8\u3044\u3066\u304d\u305f\u5185\u5bb9\u3067\u3042\u308b\u7a0b\u5ea6\u306f\u3001\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u3053\u3068\u304c\u51fa\u6765\u308b\u3068\u601d\u3044\u307e\u3059\u3002\u3057\u304b\u3057<strong>Git<\/strong>\u306f\u8907\u6570\u4eba\u3067\u4f7f\u3063\u305f\u5834\u5408\u306b\u3055\u3089\u306b\u8907\u96d1\u306a\u554f\u984c\u3082\u51fa\u3066\u304d\u307e\u3059\u3002\u307e\u305f\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u3069\u306e\u3088\u3046\u306b\u4f7f\u3046\u304b\u306a\u3069\u306e\u30d6\u30e9\u30f3\u30c1\u30e2\u30c7\u30eb\u3001<strong>git-flow<\/strong>\u3068\u304b\u3082\u6709\u540d\u3067\u3059\u304c\u3001\u305d\u3046\u3044\u3046\u904b\u7528\u3082\u8003\u3048\u305f\u308a\u3068\u304b<strong>Git<\/strong>\u306e\u5965\u306f\u6df1\u304f\u3001\u4f7f\u3044\u3053\u306a\u3059\u3068\u3001\u79c1\u305f\u3061\u306b\u7d20\u6674\u3089\u3057\u3044\u6069\u6075\u3092\u4e0e\u3048\u3066\u304f\u308c\u308b\u3082\u306e\u3067\u3042\u308b\u3068\u5b9f\u611f\u3057\u307e\u3057\u305f\u3002<\/p>\n<h2>\u53c2\u8003\u6587\u732e<\/h2>\n<p>\u5165\u9580Git\u3000\u6ff1\u91ce \u7d14(Junio C Hamano)<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u3053\u3093\u306b\u3061\u306f\u3001\u5e73\u5965\u3067\u3059\uff01<\/p>\n<p>\u3053\u308c\u306fTECHSCORE Advent Calendar 2015\u306e23\u65e5\u76ee\u306e\u8a18\u4e8b\u3067\u3059\u3002<\/p>\n<p>\u306f\u3058\u3081\u306b<br \/>\n\u958b\u767a\u3067\u30bd\u30fc\u30b9\u306e\u7ba1\u7406\u3092\u3059\u308b\u306e\u306b\u3001\u5206\u6563\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u306eGit\u3092\u4f7f\u3046\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002<br \/><a href=\"https:\/\/www.techscore.com\/blog\/2015\/12\/23\/git-%e5%9b%b0%e3%81%a3%e3%81%9f%e3%81%a8%e3%81%8d%e3%81%aetips%e9%9b%86\/\">\u7d9a\u304d\u3092\u8aad\u3080...<\/a><\/p>\n","protected":false},"author":29,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[215,18],"tags":[141,110],"_links":{"self":[{"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/posts\/8856"}],"collection":[{"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/users\/29"}],"replies":[{"embeddable":true,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/comments?post=8856"}],"version-history":[{"count":105,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/posts\/8856\/revisions"}],"predecessor-version":[{"id":9814,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/posts\/8856\/revisions\/9814"}],"wp:attachment":[{"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/media?parent=8856"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/categories?post=8856"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.techscore.com\/blog\/wp-json\/wp\/v2\/tags?post=8856"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}