{"id":177,"date":"2020-03-01T21:09:10","date_gmt":"2020-03-01T12:09:10","guid":{"rendered":"https:\/\/buru.wew.jp\/?p=177"},"modified":"2021-10-10T20:48:19","modified_gmt":"2021-10-10T11:48:19","slug":"git%e3%81%be%e3%81%a8%e3%82%81","status":"publish","type":"post","link":"https:\/\/buru.wew.jp\/?p=177","title":{"rendered":"Git\u307e\u3068\u3081"},"content":{"rendered":"\n

Git\u3068\u306f\uff1f\uff1f<\/strong><\/strong><\/h2>\n\n\n\n

Git\u3068\u306fSubversion\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3092\u884c\u3046\u3053\u3068\u304c\u51fa\u6765\u308b\u3082\u306e\u3002
\u8907\u6570\u4eba\u3067\u4f55\u304b\u958b\u767a\u3059\u308b\u3068\u304d\u306b\u4f5c\u696d\u3092\u5206\u62c5\u3057\u3066\u884c\u3046\u3068\u304d\u306b\u529b\u3092\u767a\u63ee\u3059\u308b\u3002
\u4ee5\u4e0b\u306e\u30b5\u30a4\u30c8\u304c\u3068\u3066\u3082\u53c2\u8003\u306b\u306a\u308b\u306e\u3067\u3053\u3061\u3089\u3082\u3069\u3046\u305e\u3002<\/p>\n\n\n\n

https:\/\/qiita.com\/y_ito\/items\/91cd96659a56ec9f9dbf<\/a><\/p>\n\n\n\n

\u4e3b\u306a\u7528\u8a9e<\/strong><\/h2>\n\n\n\n

\u3053\u3053\u306b\u8a18\u8f09\u3057\u3066\u3044\u308b\u5185\u5bb9\u306f\u500b\u4eba\u7684\u306a\u7406\u89e3\u306a\u306e\u3067\u9d5c\u5451\u307f\u3057\u306a\u3044\u3088\u3046\u306b\u3002
\u306a\u308b\u3079\u304f\u5c02\u9580\u7528\u8a9e\u3092\u4f7f\u308f\u305a\u306b\u89e3\u8aac\u3057\u305f\u3064\u3082\u308a\u3067\u3059\u3002
(\u30cd\u30c3\u30c8\u3084\u66f8\u7c4d\u3067\u8aac\u660e\u3057\u3066\u3044\u308b\u3082\u306e\u3068\u306f\u76f8\u9055\u70b9\u304c\u591a\u3044\u3067\u3059\u3002)<\/p>\n\n\n\n

Git<\/strong><\/h3>\n\n\n\n

\u5206\u6563\u7ba1\u7406\u69cb\u6210\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u306e\u3053\u3068\u3002<\/p>\n\n\n\n

\u30ea\u30dd\u30b8\u30c8\u30ea<\/strong><\/h3>\n\n\n\n

Git\u3067\u7ba1\u7406\u3055\u308c\u3066\u3044\u308b\u8cc7\u6750\u304c\u307e\u3068\u307e\u3063\u3066\u3044\u308b\u3082\u306e<\/p>\n\n\n\n

\u30d6\u30e9\u30f3\u30c1(\u679d\u3001\u6d3e\u751f\u5148)<\/strong><\/h3>\n\n\n\n

Git\u7ba1\u7406\u3057\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u5358\u4f4d\u3001(\u3053\u308c\u304cGit\u306e\u3044\u3044\u3068\u3053\u308d\uff01)<\/p>\n\n\n\n

\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(\u53d6\u5f97)<\/strong><\/h3>\n\n\n\n

\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u3084\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u306e\u3053\u3068\u3092\u6307\u3059<\/p>\n\n\n\n

\u30af\u30ed\u30fc\u30f3<\/strong><\/h3>\n\n\n\n

\u8907\u88fd\u3001\u5148\u8ff0\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u81ea\u8eab\u306e\u30ed\u30fc\u30ab\u30eb(C\u30c9\u30e9\u30a4\u30d6\u7b49)\u306b\u30b3\u30d4\u30fc\u3059\u308b\u3053\u3068<\/p>\n\n\n\n

\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1<\/strong><\/h3>\n\n\n\n

\u307f\u3093\u306a\u3067\u89e6\u308b\u30d6\u30e9\u30f3\u30c1\u3001\u57fa\u672c\u7684\u306b\u306f\u76f4\u63a5\u89e6\u3089\u306a\u3044\u3053\u3068\uff01
\u203b\u53d6\u308a\u6271\u3044\u306b\u6ce8\u610f<\/p>\n\n\n\n

\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1<\/strong><\/h3>\n\n\n\n

\u4e00\u4eba\u3067\u89e6\u308b\u30d6\u30e9\u30f3\u30c1\u3001\u3053\u3053\u3067\u4fee\u6b63\u3057\u305f\u3082\u306e\u3092\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u3066\u3044\u304f<\/p>\n\n\n\n

 \u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308b<\/strong><\/h3>\n\n\n\n

\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u3068\u540c\u7fa9<\/p>\n\n\n\n

 \u30d6\u30e9\u30f3\u30c1\u306e\u30de\u30fc\u30b8<\/strong><\/h3>\n\n\n\n

 \u30d6\u30e9\u30f3\u30c1\u3092\u5408\u6210\u3055\u305b\u308b\u3053\u3068\u3002\u5177\u4f53\u4f8b\u3068\u3057\u3066\u3001\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u3082\u3068\u306b\u4f5c\u3063\u305f\u958b\u767a\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u70b9\u3092\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u308b\u3053\u3068\u3092\u3044\u3046\u3002<\/p>\n\n\n\n

 \u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1<\/strong><\/h3>\n\n\n\n

\u5358\u306b\u300c\u30de\u30b9\u30bf\u30fc\u300d\u3068\u3082\u3002\u30ea\u30ea\u30fc\u30b9\u306e\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u3001\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u306f\u3059\u3079\u3066\u306e\u30c6\u30b9\u30c8\u304c\u5b8c\u4e86\u3057\u305f\u72b6\u614b\u3067\u3042\u308b\u3053\u3068\u304c\u307b\u3068\u3093\u3069\u3002
\u5f8c\u8ff0\u3059\u308b\u958b\u767a\u30d6\u30e9\u30f3\u30c1\u306f\u57fa\u672c\u7684\u306b\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u8d77\u70b9\u306b\u4f5c\u6210\u3055\u308c\u308b\u3002<\/p>\n\n\n\n

\u958b\u767a\u30d6\u30e9\u30f3\u30c1<\/strong><\/h3>\n\n\n\n

\u6587\u5b57\u901a\u308a\u958b\u767a\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u7c92\u5ea6\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u65b9\u91dd\u306b\u3088\u3063\u3066\u7570\u306a\u308b\u304c\u3001\u57fa\u672c\u7684\u306b\u4e00\u3064\u306e\u8ab2\u984c\u306b\u5bfe\u3057\u3066\u4e00\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u4f5c\u6210\u3055\u308c\u308b\u3053\u3068\u304c\u591a\u3044\u3002
\u305d\u306e\u7406\u7531\u306e\u4e00\u3064\u3068\u3057\u3066\u3001\u8907\u6570\u306e\u8ab2\u984c\u3092\u4e00\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u958b\u767a\u3057\u3088\u3046\u3068\u3059\u308b\u3068\u3001\u3069\u308c\u304b\u4e00\u3064\u3067\u3082\u8ab2\u984c\u304c\u9054\u6210\u3055\u308c\u306a\u3044\u3067\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u306a\u3069\u306b\u30de\u30fc\u30b8\u3055\u308c\u305f\u5834\u5408\u3001\u767a\u898b\u304c\u56f0\u96e3\u306b\u306a\u308b\u3002<\/p>\n\n\n\n

\u4e3b\u306aGit\u30b3\u30de\u30f3\u30c9<\/strong><\/h2>\n\n\n\n

 Clone(\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b3\u30d4\u30fc\u3092\u53d6\u5f97)<\/strong><\/h3>\n\n\n\n

\u65e2\u306b\u4f5c\u6210\u3055\u308c\u3066\u3044\u308bGit\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b3\u30d4\u30fc\u3092\u53d6\u5f97\u3059\u308b
$ git clone http:\/\/example\/sampledirectory\/sampleproject.git<\/p>\n\n\n\n

Branch(\u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u6210)<\/strong><\/h3>\n\n\n\n

\u73fe\u5728\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\u5225\u540d\u30b3\u30d4\u30fc\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u3002(\u30d6\u30e9\u30f3\u30c1\u306e\u79fb\u52d5\u306f\u884c\u308f\u308c\u306a\u3044)
 $ git branch branch_name<\/p>\n\n\n\n

Checkout(\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u4ee5\u5916\u306b\u3082\u3064\u304b\u3046\u3088\uff01\uff01)<\/strong><\/h3>\n\n\n\n

\u30d6\u30e9\u30f3\u30c1\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
\u4f5c\u6210\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b(\u4f5c\u696d\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u79fb\u52d5)
$ git checkout branch_name<\/p>\n\n\n\n

\u30d5\u30a1\u30a4\u30eb\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/strong><\/h3>\n\n\n\n

\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
$ git checkout source\/xxxproject\/XXXfile.txt<\/p>\n\n\n\n

\u8907\u6570\u30d5\u30a1\u30a4\u30eb\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u5834\u5408\u306f\u300c.\u300d\u3092\u4f7f\u3046
$ git checkout source\/xxxproject\/.<\/p>\n\n\n\n

Tips
\u4fee\u6b63\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30d6\u30e9\u30f3\u30c1\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6642\u306e\u72b6\u614b\u306b\u623b\u3057\u305f\u3044\u3068\u304d\u306b\u3082\u4f7f\u3048\u308b\uff01<\/p>\n\n\n\n

https:\/\/qiita.com\/macer_fkm\/items\/ea2337a9b504b982c295<\/a><\/p>\n\n\n\n

Status(\u5909\u66f4\u5185\u5bb9\u306e\u78ba\u8a8d)<\/strong><\/h3>\n\n\n\n

\u4fee\u6b63\u30fb\u8ffd\u52a0\u5185\u5bb9\u306e\u78ba\u8a8d
\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0\u3084\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3046\u524d\u306b\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u78ba\u8a8d\u3059\u308b\u969b\u306b\u4f7f\u7528\u3059\u308b
$ git status<\/p>\n\n\n\n

 Add(\u5909\u66f4\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0)<\/strong><\/h3>\n\n\n\n

\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3044\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0
1\u3064\u305a\u3064\u9078\u629e\u3059\u308b\u5834\u5408(\u3053\u3063\u3061\u306e\u304c\u5b89\u5168)
$ git add file_name<\/p>\n\n\n\n

\u7de8\u96c6\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u5168\u90e8\u9078\u629e\u3059\u308b\u5834\u5408(\u7de8\u96c6\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u304c\u5c11\u306a\u3044\u6642\u306f\u3053\u3063\u3061\u3067\u3082)
$ git add .<\/p>\n\n\n\n

Commit(\u8ffd\u52a0\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u5b9a)<\/strong><\/h3>\n\n\n\n

\u30b3\u30df\u30c3\u30c8
\u8ffd\u52a0\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u78ba\u5b9a
$ git commit \u2013m \u201ccommit_reason\u201d<\/p>\n\n\n\n

$ git commit \u2013amend \u2013no-edit
\u30b9\u30c6\u30fc\u30b8\u3055\u308c\u305f\u5185\u5bb9\u3068\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3068\u306e\u7d50\u5408\u3092\u3059\u308b\u3002\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u306b\u6f0f\u308c\u3066\u3044\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u6c17\u4ed8\u3044\u305f\u6642\u3084\u3061\u3087\u3068\u3057\u305f\u4fee\u6b63\u3092\u3057\u3066\u524d\u306e\u30b3\u30df\u30c3\u30c8\u306b\u52a0\u3048\u305f\u3044\u5834\u5408\u306a\u3069\u306b\u4fbf\u5229\u3002
\u300c\u3069\u306e\u30bf\u30a4\u30df\u30f3\u30b0\u3067\u30b3\u30df\u30c3\u30c8\u3057\u3088\u3046\u304b\uff1f\u300d\u3068\u8ff7\u3046\u304f\u3089\u3044\u306a\u3089\u3068\u308a\u3042\u3048\u305a\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3001\u305d\u308c\u304b\u3089\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3069\u3093\u3069\u3093\u8ffd\u52a0\u3057\u3066\u3044\u3051\u3070\u3044\u3044\u3002
 \u201c\u2013no-edit\u201d \u3092\u4ed8\u3051\u306a\u3044\u3068\u30a8\u30c7\u30a3\u30bf\u304c\u7acb\u3061\u4e0a\u304c\u3063\u3066\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u7de8\u96c6\u753b\u9762\u306b\u306a\u3063\u3066\u3057\u307e\u3046\u3002<\/p>\n\n\n\n

$ git commit \u2013amend [-m \uff1c\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\uff1e]
\u4e0a\u3068\u540c\u3058\u3060\u304c\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u3064\u3044\u3067\u306b\u7de8\u96c6\u3057\u305f\u3044\u5834\u5408\u306f \u201c\u2013no-edit\u201d \u3092\u4ed8\u3051\u305a\u306b\u5b9f\u884c\u3059\u308b\u3002
\u3053\u306e\u8a18\u4e8b\u3067\u4ee5\u524d\u306f\u300c\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u306e\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u5909\u66f4\u3059\u308b\u300d\u3068\u8aac\u660e\u3057\u3066\u3044\u305f\u304c\u3001\u305d\u308c\u306f\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u4f55\u3082\u8ffd\u52a0\u3057\u3066\u3044\u306a\u3044\u72b6\u614b\u3067\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308c\u3070\u7d50\u679c\u7684\u306b\u306f\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5909\u66f4\u306b\u306a\u308b\u3068\u3044\u3046\u3053\u3068\u3002<\/p>\n\n\n\n

https:\/\/qiita.com\/y_ito\/items\/91cd96659a56ec9f9dbf<\/a><\/p>\n\n\n\n

Push(\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u53cd\u6620)<\/strong><\/h3>\n\n\n\n

\u30d7\u30c3\u30b7\u30e5
\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u53cd\u6620\u3001\u5927\u4f53Pull\u3057\u3066\u304b\u3089\u3084\u308b
$ git push origin remote_branch_name
\u203bpush\u3067\u304d\u306a\u3044\u3068\u304d\u306fpush \u2013f\u3067\u5f37\u5236\u30d7\u30c3\u30b7\u30e5\u3067\u304d\u308b\u3002\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u5f37\u5236\u7684\u306b\u4e0a\u66f8\u304d\u3059\u308b\u305f\u3081\u4f7f\u3044\u65b9\u306b\u306f\u6ce8\u610f<\/p>\n\n\n\n

Tips
Push\u304creject\u3055\u308c\u308b
https:\/\/qiita.com\/katsuyuki\/items\/8e03e5eb4223912a08c5<\/a><\/p>\n\n\n\n

Pull(\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5909\u66f4\u5185\u5bb9\u3092\u53d6\u5f97)<\/strong><\/h3>\n\n\n\n

\u30d7\u30eb
\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306b\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5909\u66f4\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u3080\u3001Push\u306e\u524d\u306b\u3059\u308b\u3053\u3068\u304c\u591a\u3044
$ git pull<\/p>\n\n\n\n

Fetch(\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u72b6\u614b\u3092\u53d6\u5f97)<\/strong><\/h3>\n\n\n\n

\u30d5\u30a7\u30c3\u30c1
\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u72b6\u614b\u3092\u30ed\u30fc\u30ab\u30eb\u306b\u53cd\u6620\u3059\u308b\u30b3\u30de\u30f3\u30c9<\/p>\n\n\n\n

\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u72b6\u614b\u3092\u53d6\u5f97\uff08\u30ea\u30e2\u30fc\u30c8\u3067\u524a\u9664\u3055\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u3082\u540c\u671f\uff09
$ git fetch -p<\/p>\n\n\n\n

Rebase(\u30d6\u30e9\u30f3\u30c1\u306e\u76f4\u5217\u5316)<\/strong><\/h3>\n\n\n\n

\u30ea\u30d9\u30fc\u30b9
\u3042\u308b\u30d6\u30e9\u30f3\u30c1A\u3092\u3082\u3068\u306b\u30d6\u30e9\u30f3\u30c1B\u3092\u4f5c\u6210\u3057\u3001\u30d6\u30e9\u30f3\u30c1B\u3067\u306e\u5909\u66f4\u3092\u30d6\u30e9\u30f3\u30c1A\u306b\u53d6\u308a\u8fbc\u3080\u3068\u304d\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8d77\u3053\u3057\u305f\u969b\u306b\u3082\u4f7f\u7528\u3059\u308b\u3053\u3068\u304c\u3042\u308b\u30b3\u30de\u30f3\u30c9\u3002
$ git rebase branchA<\/p>\n\n\n\n

Ex
\u3042\u308b\u30d6\u30e9\u30f3\u30c1A\u3092\u3082\u3068\u306b\u30d6\u30e9\u30f3\u30c1B\u3092\u4f5c\u6210\u3057\u3066\u30d6\u30e9\u30f3\u30c1B\u4e0a\u3067\u958b\u767a\u3092\u884c\u3063\u3066\u3044\u305f\u969b\u306b\u3001\u30d6\u30e9\u30f3\u30c1A\u306b\u30b3\u30df\u30c3\u30c8\u304c\u884c\u308f\u308c\u3001\u30d6\u30e9\u30f3\u30c1B\u3092\u30d6\u30e9\u30f3\u30c1A\u306b\u30de\u30fc\u30b8\u3057\u3088\u3046\u3068\u3059\u308b\u3068\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8d77\u3053\u3059\u3002\u30fb\u30fb\u30fbfastForwardMarge\u304c\u51fa\u6765\u306a\u3044\uff01\uff01\uff01<\/p>\n\n\n\n

Stash(\u4f5c\u696d\u5185\u5bb9\u306e\u9000\u907f)<\/strong><\/h3>\n\n\n\n

\u30b9\u30bf\u30c3\u30b7\u30e5
\u4f5c\u696d\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u696d\u5185\u5bb9\u3092\u4e00\u6642\u7684\u306b\u4fdd\u5b58\u3057\u305f\u3044\u3068\u304d\u306b\u4f7f\u3046\u30b3\u30de\u30f3\u30c9
\u30d6\u30e9\u30f3\u30c1\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(\u79fb\u52d5)\u3092\u3059\u308b\u3068\u304d\u306a\u3069\u306b\u4fbf\u5229<\/p>\n\n\n\n

\u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u696d\u5185\u5bb9\u3092\u9000\u907f
$ git stash save<\/p>\n\n\n\n

\u9000\u907f\u3057\u305f\u4f5c\u696d\u5185\u5bb9\u3092\u5fa9\u6d3b
$ git stash pop

\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30d4\u30fc
$ git checkout base_branch_name \u2013b new_branch_name<\/p>\n\n\n\n

\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u6d3e\u751f\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u3082\u3068\u306b\u958b\u767a\u3092\u3057\u305f\u3044\u6642\u306a\u3069\u306b\u4f7f\u3048\u308b\u30b3\u30de\u30f3\u30c9
\u4f8b)ver1.0\u3092\u534a\u5e74\u5f8c\u306bver1.1\u3068\u3057\u3066\u30ea\u30ea\u30fc\u30b9\u3057\u305f\u3044\u3002\u3058\u3083\u3042\u3001\u958b\u767a\u3057\u307e\u3059\u304b\u3002Ver1.1\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u4f5c\u6210\u3057\u305f\u304b\u3089\u305d\u3053\u304b\u3089issue\u3054\u3068\u306b\u30d6\u30e9\u30f3\u30c1\u5207\u3063\u3066\u958b\u767a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
$ git checkout develop\/1.1.0 \u2013b issues\/addNewModify
-b\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u3088\u308a\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u3068\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3067\u304d\u308b<\/p>\n\n\n\n

\u6a2a\u7740\u3057\u306a\u3044\u3067\u6d3e\u751f\u5143\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5
$ git checkout originalBranch<\/p>\n\n\n\n

\u958b\u767a\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210
$ git branch newDevelopBranchName<\/p>\n\n\n\n

\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/strong><\/h3>\n\n\n\n

\u5358\u306b\u201dPR\u201d\u3084\u201d\u30d7\u30eb\u30ea\u30af\u201d\u306a\u3069\u3068\u8a33\u3055\u308c\u308b\u3053\u3068\u304c\u591a\u3044\u3002
\u57fa\u672c\u7684\u306b\u306fgit push \u3092\u3059\u308b\u3068gitbucket\u4e0a\u3067\u307b\u304b\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5909\u66f4\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u3093\u3067\u3088\u3044\u304b\u3092\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u3068\u304d\u306b\u7528\u3044\u3089\u308c\u308b\u3002<\/p>\n\n\n\n

\u30de\u30fc\u30b8<\/strong><\/h3>\n\n\n\n

 \u57f7\u7b46\u4e2d<\/p>\n\n\n\n

 Rebase\u3068Stash\u3092\u7d44\u307f\u5408\u308f\u305b\u305f\u30ea\u30d9\u30fc\u30b9<\/strong><\/h3>\n\n\n\n

 \u5229\u7528\u4f8b
 \u4eca\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306fissue\/add_modify<\/p>\n\n\n\n

\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u79fb\u308d\u3046\u304b\u306a
$ git checkout develop\/1.1.0<\/p>\n\n\n\n

error: Your local changes to the following files would be overwritten by checkout:
 document\/01_release\/specifications\/XXXspecifications.xlsx
 Please commit your changes or stash them before you switch branches.
 Aborting<\/p>\n\n\n\n

\u30a8\u30e9\u30fc\u3067\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3067\u304d\u306a\u3044\uff08\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u304c\u3067\u304d\u306a\u3044\uff09\uff01\uff01
\u4f5c\u696d\u5185\u5bb9\u3092\u9000\u907f\u3057\u3088\u3046
$ git stash save<\/p>\n\n\n\n

\u4f55\u9000\u907f\u3057\u305f\u3093\u3060\u3063\u3051\uff1f
$ git stash list<\/p>\n\n\n\n

\u6539\u3081\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3088\u3046
$ git checkout develop\/1.1.0<\/p>\n\n\n\n

\u30ea\u30d9\u30fc\u30b9\u3059\u308b\u304b
\u3055\u3063\u304dstash\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
$ git checkout issue\/add_modify<\/p>\n\n\n\n

\u30ea\u30d9\u30fc\u30b9\u3057\u3088\u3046
$ git rebase develop\/1.1.0<\/p>\n\n\n\n

\u30ea\u30d9\u30fc\u30b9\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u9000\u907f\u3057\u305f\u4f5c\u696d\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u3082\u3046\uff01
$ git stash pop<\/p>\n\n\n\n

\u304a\u308f\u308a<\/p>\n\n\n\n

 \u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af<\/strong><\/h3>\n\n\n\n

\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u4f5c\u696d\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u307f\u305f\u3044<\/p>\n\n\n\n

\u53d6\u308a\u8fbc\u307f\u305f\u3044\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3059\u308b
\u203b\u79fb\u52d5\u3067\u304d\u306a\u3044\u3068\u304d\u306fStash(\u4f5c\u696d\u5185\u5bb9\u306e\u9000\u907f)\u3092\u53c2\u7167\u306e\u3053\u3068
$ git checkout branchA<\/p>\n\n\n\n

\u30ed\u30b0\u30b3\u30de\u30f3\u30c9\u3067\u53d6\u308a\u8fbc\u307f\u305f\u3044\u30b3\u30df\u30c3\u30c8\u306e\u30b3\u30df\u30c3\u30c8\u756a\u53f7\u3092\u63a2\u3059
$ git log
 commit 1efcdxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx9
 Author: buruyuki
 Date: Fri May 10 10:15:22 2019 +0900999 \u51e6\u7406\u4e00\u89a7\u66f4\u65b0<\/p>\n\n\n\n

\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u306b\u623b\u308b
$ git checkout branchB<\/p>\n\n\n\n

\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u65bd
$ git cherry-pick -m 1 9xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx1
-m \u30b3\u30de\u30f3\u30c9\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u3068\u304d\u306b\u4ed8\u4e0e\u3059\u308b\u3002\u57fa\u672c\u7684\u306b\u306f1\u3092\u4f7f\u3046\u3068\u601d\u3046\u3002\u8a73\u7d30\u306f\u4ee5\u4e0b\u53c2\u7167<\/p>\n\n\n\n

http:\/\/te2u.hatenablog.jp\/entry\/2013\/11\/02\/130740<\/a><\/p>\n\n\n\n

\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u78ba\u8a8d
$ git status
 Unmerged paths:
 (use \u201cgit add \u2026\u201d to mark resolution)
 both modified: document\/01_release\/Specifications\/XxxSpecifications.xlsx<\/p>\n\n\n\n

\u5909\u66f4\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\u3002
$ git add document\/01_release\/Specifications\/XxxSpecifications.xlsx<\/p>\n\n\n\n

\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u78ba\u8a8d
$ git status
 Changes to be committed:
 modified: document\/01_release\/Specifications\/XxxSpecifications.xlsx<\/p>\n\n\n\n

\u30b3\u30df\u30c3\u30c8\u3059\u308b\uff08\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u304a\u3064\u304b\u308c\u3055\u307e\uff09
$ git commit
\u203b\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u6642\u306f\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8-m \u30b3\u30de\u30f3\u30c9\u3092\u8ffd\u52a0\u3057\u306a\u3044\u3002<\/p>\n\n\n\n

\u30d6\u30e9\u30f3\u30c1\u540d\u304c(issues\/244_Xxx_Comment_keep|CHERRY-PICKING)
\u3053\u3093\u306a\u611f\u3058\u3060\u3063\u305f\u3089\u307e\u3060\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u304c\u7d42\u308f\u3063\u3066\u306a\u3044...<\/p>\n\n\n\n

\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u3092\u3084\u3081\u305f\u3044\u3068\u304d\u306f...
$ git cherry-pick \u2013abort<\/p>\n\n\n\n

\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3059(\u30ed\u30fc\u30eb\u30d0\u30c3\u30af)<\/strong><\/h3>\n\n\n\n

\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3059\u308b\u306b\u306f
$ git reset \u2013soft HEAD^
<\/p>\n\n\n\n

\u307e\u305f\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u4ee5\u4e0b
\u2013soft\u2026\u30ef\u30fc\u30af\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u5185\u5bb9\u306f\u305d\u306e\u307e\u307e\u3067\u30b3\u30df\u30c3\u30c8\u3060\u3051\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u5834\u5408
\u2013hard\u2026\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u305f\u4e0a\u3067\u30ef\u30fc\u30af\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u5185\u5bb9\u3082\u66f8\u304d\u63db\u3048\u305f\u3044\u5834\u5408
HEAD^\u2026\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u610f\u5473\u3059\u308b
HEAD~{n}\u2026n\u500b\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u610f\u5473\u3059\u308b
HEAD^\u3084HEAD~{n}\u306e\u4ee3\u308f\u308a\u306b\u30b3\u30df\u30c3\u30c8\u756a\u53f7\u3092\u66f8\u3044\u3066\u3082\u3088\u3044\uff08\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u4ee5\u5916\u306f\u3053\u3063\u3061\u306e\u307b\u3046\u304c\u3044\u3044\u304b\u3082\uff09<\/p>\n\n\n\n

https:\/\/qiita.com\/shuntaro_tamura\/items\/06281261d893acf049ed<\/a><\/p>\n\n\n\n

CRLF\u306b\u3064\u3044\u3066<\/strong><\/h3>\n\n\n\n

Git\u306b\u65b0\u898f\u3067\u30d5\u30a1\u30a4\u30eb\u3092add\u3057\u305f\u3068\u304d\u306b\u300cCRLF\u306fLF\u306b\u5909\u63db\u3055\u308c\u307e\u3059\u300d\u306e\u3088\u3046\u306awarn\u30ed\u30b0\u304c\u51fa\u305f\u5834\u5408\u306f\u30c6\u30ad\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf\u3067(\\r\\n\u2192\\n)\u3067\u7f6e\u63db\u3057\u3066\u304b\u3089add\u3059\u308c\u3070warn\u30ed\u30b0\u306f\u51fa\u3066\u3053\u306a\u3044\u3002
Git\u304cUNIX\u3067\u958b\u767a\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30ed\u30fc\u30ab\u30eb\u306e\u958b\u767a\u74b0\u5883\u304cWindows\u306e\u5834\u5408\u306b\u8d77\u304d\u308b<\/p>\n\n\n\n

\u8ffd\u8a18
$ git config \u2013global core.autocrlf\u304ctrue\u307e\u305f\u306finput\u3067\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u3001git\u304c\u6539\u884c\u30b3\u30fc\u30c9\u3092\u81ea\u52d5\u3067\u5909\u63db\u3057\u3066\u304f\u308c\u308b\u306e\u3067\u4e0a\u8a18\u624b\u9806\u3092\u8e0f\u307e\u305a\u3068\u3082\u554f\u984c\u306a\u3044\u3002\uff08\u3061\u306a\u3001\u30d6\u30eb\u306finput\u3067\u8a2d\u5b9a\u3057\u3066\u307e\u3059\uff09<\/p>\n\n\n\n

https:\/\/qiita.com\/uggds\/items\/00a1974ec4f115616580<\/a><\/p>\n\n\n\n

add\u3092\u53d6\u308a\u6d88\u3059<\/strong><\/h3>\n\n\n\n

$ git reset HEAD sample.txt<\/p>\n\n\n\n

https:\/\/qiita.com\/nabezokodaikon\/items\/7ee4900d28d8d863978e<\/a><\/p>\n\n\n\n

\u305d\u306e\u4ed6<\/strong><\/h3>\n\n\n\n

 GitBash\u306e\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u3068\u304b<\/p>\n\n\n\n

https:\/\/www.granfairs.com\/blog\/staff\/gitbash-setting-shortcut<\/a><\/p>\n\n\n\n

\u30ea\u30d9\u30fc\u30b9(\u30b3\u30df\u30c3\u30c8\u306e\u7d71\u5408)<\/strong><\/h3>\n\n\n\n

$ git rebase \u2013i commitNo<\/p>\n\n\n\n

\u6307\u5b9a\u3059\u308b\u30b3\u30df\u30c3\u30c8\u756a\u53f7\u306f\u307e\u3068\u3081\u305f\u3044\u30b3\u30df\u30c3\u30c8\u306e\u3072\u3068\u3064\u524d\u306e\u30b3\u30df\u30c3\u30c8\u756a\u53f7\u3092\u6307\u5b9a<\/p>\n\n\n\n

https:\/\/qiita.com\/tsuuuuu_san\/items\/f708a9f7ea8ab8eb6945<\/a>
https:\/\/dev.classmethod.jp\/tool\/git\/git-rebase-fixup\/<\/a>
http:\/\/blog.katty.in\/853<\/a><\/p>\n\n\n\n

\u6587\u5b57\u3092\u5165\u529b\u3057\u7d42\u308f\u3063\u305f\u3089\u3001ESC\u3057\u3066:wq\u3092\u6253\u3064\u3002<\/p>\n\n\n\n

\u203b\u30e1\u30e2
\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u7834\u68c4\u3059\u308b\u5834\u5408\u306ffixup\u3092\u6307\u5b9a\u3059\u308b\u3002<\/p>\n\n\n\n

\u8ffd\u8de1\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664<\/strong><\/h3>\n\n\n\n

$ git clean [-d] -n # \u524a\u9664\u5bfe\u8c61\u306e\u78ba\u8a8d
$ git clean -f # \u524a\u9664\u5b9f\u884c
$ git clean -d -f # \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3082\u542b\u3081\u3066\u524a\u9664<\/p>\n","protected":false},"excerpt":{"rendered":"

Git\u3068\u306f\uff1f\uff1f Git\u3068\u306fSubversion\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3092\u884c\u3046\u3053\u3068\u304c\u51fa\u6765\u308b\u3082\u306e\u3002\u8907\u6570\u4eba\u3067\u4f55\u304b\u958b\u767a\u3059\u308b\u3068\u304d\u306b\u4f5c\u696d\u3092\u5206\u62c5\u3057\u3066\u884c\u3046\u3068\u304d\u306b\u529b\u3092\u767a\u63ee\u3059\u308b\u3002\u4ee5\u4e0b\u306e\u30b5\u30a4\u30c8\u304c\u3068\u3066\u3082\u53c2\u8003\u306b\u306a\u308b\u306e\u3067\u3053\u3061\u3089\u3082\u3069\u3046\u305e\u3002 https:\/\/q […]<\/p>\n","protected":false},"author":1,"featured_media":259,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[],"tags":[],"class_list":["post-177","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry"],"jetpack_featured_media_url":"https:\/\/buru.wew.jp\/wp-content\/uploads\/2022\/06\/buru-1-scaled.jpg","_links":{"self":[{"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/posts\/177","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=177"}],"version-history":[{"count":4,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/posts\/177\/revisions"}],"predecessor-version":[{"id":183,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/posts\/177\/revisions\/183"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=\/wp\/v2\/media\/259"}],"wp:attachment":[{"href":"https:\/\/buru.wew.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=177"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=177"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/buru.wew.jp\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=177"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}