{"id":3585,"date":"2023-01-05T17:39:29","date_gmt":"2023-01-05T08:39:29","guid":{"rendered":"https:\/\/techmania.jp\/blog\/?p=3585"},"modified":"2025-08-07T10:58:25","modified_gmt":"2025-08-07T01:58:25","slug":"git0002","status":"publish","type":"post","link":"https:\/\/techmania.jp\/blog\/git0002\/","title":{"rendered":"\u3010Git\u5165\u9580\u8005\u5411\u3051\u3011git pull\u30b3\u30de\u30f3\u30c9\u306e\u4f7f\u3044\u65b9\u3084git fetch\u306a\u3069\u3068\u306e\u9055\u3044\u3092\u89e3\u8aac"},"content":{"rendered":"

git pull \u30b3\u30de\u30f3\u30c9\u306f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u884c\u3063\u305f\u5909\u66f4\u3092\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u3080\u6a5f\u80fd\u3067\u3059\u3002\u591a\u4eba\u6570\u3067\u958b\u767a\u3092\u884c\u3046\u969b\u306b\u5dee\u7570\u304c\u7121\u304f\u306a\u308b\u306e\u3067\u3001\u30d7\u30ed\u30c0\u30af\u30c8\u306e\u958b\u767a\u3067\u91cd\u5b9d\u3055\u308c\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u5b9f\u969b\u3001\u307f\u306a\u3055\u3093\u304c Git <\/a>\u3092\u7528\u3044\u3066\u958b\u767a\u3092\u884c\u3046\u969b\u3001git pull \u30b3\u30de\u30f3\u30c9\u3092\u5fc5\u305a\u3068\u8a00\u3063\u3066\u3044\u3044\u307b\u3069\u4f7f\u7528\u3057\u3066\u3044\u308b\u306e\u3067\u306f\u306a\u3044\u3067\u3057\u3087\u3046\u304b\u3002<\/p>\n

\u305d\u3093\u306a\u4fbf\u5229\u306agit pull\u30b3\u30de\u30f3\u30c9\u3067\u3059\u304c\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u64cd\u4f5c\u3092\u9593\u9055\u3048\u308b\u3068\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u5185\u5bb9\u304c\u885d\u7a81\u3059\u308b\u201d\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u201d\u304c\u767a\u751f\u3059\u308b\u5371\u967a\u6027\u304c\u3042\u3063\u305f\u308a\u3068\u3001\u4fbf\u5229\u3060\u304b\u3089\u3053\u305d\u6c17\u3092\u4ed8\u3051\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u70b9\u3082\u6570\u591a\u304f\u3042\u308a\u307e\u3059\u3002<\/p>\n

\u672c\u8a18\u4e8b\u3067\u306f\u3001git pull \u30b3\u30de\u30f3\u30c9\u306b\u95a2\u3057\u3066\u57fa\u790e\u7684\u306a\u4f7f\u3044\u65b9\u304b\u3089\u6ce8\u610f\u70b9\u3084\u30b3\u30de\u30f3\u30c9\u306e\u5fdc\u7528\u307e\u3067\u89e3\u8aac\u3057\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n

\n

\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u306e\u57fa\u790e\u304b\u3089\u30b5\u30a4\u30c8\u5236\u4f5c\u307e\u3067
\u2193\u5b9f\u8df5\u529b\u304c\u8eab\u306b\u3064\u304f\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u2193<\/a><\/p>\n<\/div>\n

\"IT\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u5b66\u6821<\/a><\/div>\n
\n

\u226b\u30e2\u30cb\u30bf\u30fc\u5272\u5f15\u30ad\u30e3\u30f3\u30da\u30fc\u30f3\u5b9f\u65bd\u4e2d\uff01\u226a<\/span><\/a><\/p>\n<\/div>\n\n\n

git pull\u3068\u306f<\/h2>\n\n\n

git pull\u3068\u306f\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u6700\u65b0\u306e\u5909\u66f4\u304c\u53cd\u6620\u3055\u308c\u305f\u72b6\u614b\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30de\u30fc\u30b8\u3059\u308bgit\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002git pull\u3067\u306f\u3001\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3060\u3051\u3067\u306a\u304f\u5909\u66f4\u5c65\u6b74\u3084\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3082\u53cd\u6620\u3055\u308c\u307e\u3059\u3002\u305d\u306e\u305f\u3081\u3001git pull\u3092\u7528\u3044\u308b\u3053\u3068\u3067\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5168\u4f53\u7684\u306a\u540c\u671f\u304c\u7c21\u5358\u306b\u884c\u3048\u307e\u3059\u3002<\/p>\n

\u8907\u6570\u4eba\u3067\u30b7\u30b9\u30c6\u30e0\u958b\u767a\u3092\u3059\u308b\u5834\u5408\u306f\u3001\u305d\u308c\u305e\u308c\u306e\u958b\u767a\u8005\u306e\u958b\u767a\u5185\u5bb9\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u53d6\u308a\u8fbc\u3080\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u4f5c\u696d\u524d\u306bgit pull\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3067\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u5dee\u7570\u306e\u306a\u3044\u72b6\u614b\u304b\u3089\u958b\u767a\u306b\u7740\u624b\u3067\u304d\u307e\u3059\u3002<\/p>\n\n\n

git pull\u3068fetch\u3068merge\u306e\u95a2\u4fc2<\/h2>\n\n\n

git pull\u306f\u300cgit fetch\u300d\u3068\u300cgit merge\u300d\u3092\u5408\u308f\u305b\u3066\u884c\u3046\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u307e\u305a\u3001\u300cgit fetch\u300d\u3092\u5b9f\u884c\u3057\u3066\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u306e\u72b6\u614b\u3092\u53d6\u5f97\u3057\u3066\u304b\u3089\u300cgit merge\u300d\u3092\u5b9f\u884c\u3057\u3001\u53d6\u5f97\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u3068\u3044\u3063\u305f\u4ed5\u7d44\u307f\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n

git fetch\u3067\u306f\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u6700\u65b0\u306e\u72b6\u614b\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u3046\u3061\u30a2\u30c3\u30d7\u30b9\u30c8\u30ea\u30fc\u30e0\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u3001git merge\u3067\u306f\u30a2\u30c3\u30d7\u30b9\u30c8\u30ea\u30fc\u30e0\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3092\u66f4\u65b0\u3057\u307e\u3059\u3002<\/p>\n\n\n\n\n\n\n

git pull\u5b9f\u884c\u524d\u5f8c\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b<\/h3>\n\n\n\n

git pull\u3092\u5b9f\u884c\u3059\u308b\u524d\u306e\u30ea\u30e2\u30fc\u30c8\/\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u72b6\u614b\u3068\u5b9f\u884c\u5f8c\u306e\u72b6\u614b\u3092\u8868\u3059\u3068\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30a4\u30e1\u30fc\u30b8\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n\n

\u3010git pull\u5b9f\u884c\u524d\u3011<\/strong><\/p>\n\n\n\n\n\n\n\n

\u3010git pull\u5b9f\u884c\u5f8c\u3011<\/strong><\/p>\n\n\n\n\n\n\n\n

<\/p>\n\n\n\n

\u57fa\u672c\u7684\u306a\u4f7f\u3044\u65b9<\/h2>\n\n\n\n

git pull\u30b3\u30de\u30f3\u30c9\u306e\u57fa\u672c\u7684\u306a\u66f8\u304d\u65b9\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n\n

git pull repositoryName branchName<\/code><\/pre><\/div>\n\n\n
\u3053\u3053\u3067\u306e\u300crepositoryName\u300d\u3068\u300cbranchName\u300d\u306f\u7701\u7565\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u3001\u7701\u7565\u3057\u305f\u5834\u5408\u306f\u3068\u3082\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u300cFETCH_HEAD\u300d\u3092\u53c2\u7167\u3057\u307e\u3059\u3002
\u300cFETCH_HEAD\u300d\u3068\u306f\u3001\u6700\u5f8c\u306b\u53d6\u5f97\u3057\u305f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u6301\u3064\u6700\u65b0\u306e\u60c5\u5831\uff08\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\uff09\u3067\u3059\u3002<\/p>\n
\u307e\u305f\u3001\u300c\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u300d\u3092\u8a2d\u5b9a\u3057\u3066\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u8a2d\u5b9a\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
\u300c\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u300d\u306e\u8a2d\u5b9a\u3068\u78ba\u8a8d\u65b9\u6cd5\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u624b\u9806\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n
\u3010\u30d6\u30e9\u30f3\u30c1\u8a2d\u5b9a\u306e\u624b\u9806\u3011<\/strong><\/p>\n\n\n\n
#\u8a2d\u5b9a\u3057\u305f\u3044 repositoryName branchName \u3092\u5165\u529b\n$ git pull --set-upstream repositoryName branchName\n#\u8a2d\u5b9a\u3067\u304d\u3066\u3044\u308b\u304b\u306e\u78ba\u8a8d\n$ git branch -vv\n#\u3053\u306e\u69d8\u306b\u306a\u3063\u3066\u3044\u308c\u3070\u6b63\u5e38\u306b\u8a2d\u5b9a\u3067\u304d\u3066\u3044\u308b\n*branchName  923efk569 [repositoryName\/branchName] <\u6700\u65b0\u306ecommit><\/code><\/pre><\/div>\n\n\n
\u3053\u3053\u3067\u8a2d\u5b9a\u3055\u3048\u3057\u3066\u304a\u3051\u3070\u4ee5\u964d\u306f\u5f15\u6570\u3092\u7701\u7565\u3057\u305f\u72b6\u614b\u3067\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u53c2\u7167\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
\u203b\u8a2d\u5b9a\u3057\u305f\u5f8c\u3001\u6700\u521d\u306e1\u56de\u306f\u5f15\u6570\u3092\u5165\u308c\u305f\u72b6\u614b\u3067 git pull repositoryName branchName \u3068\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u306e\u3067\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/span><\/p>\n\n\n
\u51e6\u7406\u81ea\u4f53\u306f git fetch + git merge<\/h2>\n\n\n
\u7e70\u308a\u8fd4\u3057\u306b\u306a\u308a\u307e\u3059\u304c\u3001git pull \u30b3\u30de\u30f3\u30c9\u306e\u51e6\u7406\u5185\u5bb9\u306f git fetch \u3068git merge \u3092\u4e00\u5ea6\u306b\u884c\u3046\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002
\u305d\u306e\u305f\u3081\u3001\u307e\u305a\u306f git fetch \u3068 git merge \u305d\u308c\u305e\u308c\u306e\u30b3\u30de\u30f3\u30c9\u306e\u6a5f\u80fd\u3092\u78ba\u8a8d\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002\u3053\u3053\u3067\u306f\u7c21\u5358\u306a\u8aac\u660e\u306b\u7559\u3081\u3055\u305b\u3066\u3044\u305f\u3060\u304d\u307e\u3059\u304c\u3001\u305d\u308c\u305e\u308c\u306e\u30b3\u30de\u30f3\u30c9\u304c\u6301\u3064\u6a5f\u80fd\u306f\u4e0b\u8a18\u306e\u901a\u308a\u3067\u3059\u3002<\/p>\n\n\n
\u30b3\u30de\u30f3\u30c9<\/td>\u6a5f\u80fd<\/td><\/tr>
git fetch<\/td>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u60c5\u5831\u3092\u53d6\u5f97\u3057\u3066\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30d4\u30fc\u3059\u308b<\/td><\/tr>
git merge<\/td>\u73fe\u5728\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u60c5\u5831\u3092\u53d6\u5f97\u3057\u3066\u53d6\u308a\u8fbc\u3080<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n
\u305d\u308c\u305e\u308c\u306e\u51e6\u7406\u5185\u5bb9\u3092\u8e0f\u307e\u3048\u305f\u4e0a\u3067\u3001\u4ee5\u4e0b\u306e\uff12\u3064\u306e\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u4f8b\u3092\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
git pull repositoryName branchName<\/code><\/pre><\/div>\n\n\n
\u3068<\/p>\n\n\n
$ git fetch repositoryName branchName\n$ git merge FETCH_HEAD #\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5834\u5408<\/code><\/pre><\/div>\n\n\n
\u306f\u5b9f\u8cea\u7684\u306b\u540c\u3058\u64cd\u4f5c\u3092\u3057\u3066\u3044\u308b\u3068\u8a00\u3048\u307e\u3059\u306d\u3002<\/p>\n\n\n
git fetch \u3068\u306e\u9055\u3044\u3068 git pull \u306b\u6f5c\u3080\u30a8\u30e9\u30fc\u306e\u5371\u967a\u6027<\/h2>\n\n\n
\u5192\u982d\u3067\u3082\u89e6\u308c\u307e\u3057\u305f\u304c git fetch \u3068 git pull \u306e\u5927\u304d\u306a\u9055\u3044\u306f\u3001 pull \u3057\u305f\u5834\u5408\u306f fetch \u306e\u3042\u3068\u306b merge \u3092\u5b9f\u884c\u3059\u308b\u3068\u3044\u3046\u70b9\u3067\u3059\u3002
git fetch \u3067\u306f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u60c5\u5831\u3092\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u5f97\u3057\u3066\u304d\u305f\u3068\u3053\u308d\u3067\u51e6\u7406\u304c\u5b8c\u4e86\u3057\u307e\u3059\u3002git pull \u306f\u305d\u3053\u304b\u3089 merge \u307e\u3067\u3092\u884c\u3044\u307e\u3059\u3002
\u4f8b\u3068\u3057\u3066\u3001\u4e0b\u8a18\u306e\u3088\u3046\u306a\u5404\u74b0\u5883\u3067\u904b\u7528\u3057\u3066\u3044\u308b\u30b5\u30a4\u30c8\u3042\u3063\u305f\u3068\u3057\u307e\u3059\u3002\u307e\u305f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u540d\u524d\u306f origin \u3068\u3057\u307e\u3059\u3002<\/p>\n\n\n
#\u4f5c\u696d\u74b0\u5883\n* development\n#\u691c\u8a3c\u74b0\u5883\n* check\n#\u672c\u756a\u74b0\u5883\n* release<\/code><\/pre><\/div>\n\n\n
\u3053\u306e\u6642\u306b\u3001 git pull \u3092\u4f7f\u308f\u305a\u306b\u4f5c\u696d\u74b0\u5883\u3067\u65bd\u3057\u305f\u4fee\u6b63\u3092\u691c\u8a3c\u74b0\u5883\u306b\u53cd\u6620\u3055\u305b\u308b\u305f\u3081\u306b\u306f\u4ee5\u4e0b\u306e\u624b\u9806\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n
#\u4f5c\u696d\u74b0\u5883\u304b\u3089\u691c\u8a3c\u74b0\u5883\u306b\u79fb\u52d5\n$ git checkout check\n#\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u60c5\u5831\u3092\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30d4\u30fc\n$ git fetch\n#\u691c\u8a3c\u74b0\u5883\u306b\u4f5c\u696d\u74b0\u5883\u306e\u5909\u66f4\u3092\u53cd\u6620\n$ git merge origin development<\/code><\/pre><\/div>\n\n\n
\u3053\u306e\u72b6\u614b\u3067\u691c\u8a3c\u74b0\u5883\u3067\u78ba\u8a8d\u3092\u3057\u3001\u672c\u756a\u74b0\u5883\u306b\u53cd\u6620\u3059\u308b\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n
#\u691c\u8a3c\u74b0\u5883\u304b\u3089\u672c\u756a\u74b0\u5883\u306b\u79fb\u52d5\n$ git checkout release\n#\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u60c5\u5831\u3092\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30d4\u30fc\n$ git fetch\n#\u672c\u756a\u74b0\u5883\u306b\u691c\u8a3c\u74b0\u5883\u306e\u5909\u66f4\u3092\u53cd\u6620\n$ git merge origin check<\/code><\/pre><\/div>\n\n\n
\u30d6\u30e9\u30f3\u30c1\u306e\u540d\u524d\u304c\u5909\u308f\u3063\u305f\u3060\u3051\u3067\u3059\u306d\u3002<\/p>\n
\u6b21\u306b git pull \u3092\u4f7f\u3063\u305f\u5834\u5408\u306f\u3053\u306e\u69d8\u306b\u306a\u308a\u307e\u3059\u3002\u4f5c\u696d\u74b0\u5883\u304b\u3089\u672c\u756a\u74b0\u5883\u307e\u3067\u4e00\u6c17\u306b\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
#\u4f5c\u696d\u74b0\u5883\u304b\u3089\u691c\u8a3c\u74b0\u5883\u306b\u79fb\u52d5\n$ git checkout check\n#\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u6700\u65b0\u60c5\u5831\u3092\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30d4\u30fc\n$ git pull origin development\n#\u691c\u8a3c\u74b0\u5883\u304b\u3089\u672c\u756a\u74b0\u5883\u306b\u79fb\u52d5\n$ git checkout release\n#\u672c\u756a\u74b0\u5883\u306b\u691c\u8a3c\u74b0\u5883\u306e\u5909\u66f4\u3092\u53cd\u6620\n$ git pull origin check<\/code><\/pre><\/div>\n\n\n
\u3053\u3061\u3089\u306e\u65b9\u304c\u30b7\u30f3\u30d7\u30eb\u3067\u624b\u9806\u3082\u5c11\u306a\u3044\u3067\u3059\u306d\u3002<\/p>\n
\u4e00\u65b9\u3067 git pull \u306b\u95a2\u3057\u3066\u306f\u3001 git fetch \u306e\u51e6\u7406\u306e\u5f8c\u306b merge \u306e\u51e6\u7406\u304c\u8ffd\u52a0\u3055\u308c\u308b\u306e\u3067\u3001\u5834\u5408\u306b\u3088\u3063\u3066\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306a\u3069\u306e\u30a8\u30e9\u30fc\u304c\u8d77\u3053\u308b\u53ef\u80fd\u6027\u304c\u751f\u3058\u308b\u70b9<\/span>\u306b\u306f\u6ce8\u610f\u304c\u5fc5\u8981\u3067\u3059\u3002
git pull \u3092\u4f7f\u7528\u3059\u308b\u5834\u5408\u306f\u3001\u3069\u306e\u30d6\u30e9\u30f3\u30c1\u3067 merge \u3059\u308b\u306e\u304b\u3001\u5225\u30d6\u30e9\u30f3\u30c1\u3067\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u3066\u3044\u306a\u3044\u304b\u306a\u3069\u306e\u78ba\u8a8d\u304c\u91cd\u8981\u306b\u306a\u3063\u3066\u304d\u307e\u3059<\/span>\u3002
\u5148\u7a0b\u306e\u4f8b\u3067\u306f\u6b63\u3057\u304f\u672c\u756a\u74b0\u5883\u307e\u3067\u53cd\u6620\u3057\u305f\u5834\u5408\u3067\u3057\u305f\u304c\u3001\u8aa4\u3063\u3066\u64cd\u4f5c\u3057\u305f\u5834\u5408\u306b merge \u307e\u3067\u884c\u3063\u3066\u3057\u307e\u3046\u306e\u3067\u3001\u5c11\u306a\u304f\u3068\u3082\u3001 git pull \u3092\u4f7f\u7528\u3059\u308b\u5834\u5408\u306b\u306f\u3001 git branch \u306a\u3069\u3067\u73fe\u5728\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u78ba\u8a8d\u3057\u3066\u304b\u3089\u884c\u3046\u306e\u304c\u671b\u307e\u3057\u3044\u3067\u3059\u306d\u3002<\/p>\n\n\n
git pull \u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u6642\u306e\u623b\u3057\u65b9<\/h2>\n\n\n\n
git pull\u3067\u8aa4\u3063\u3066\u30d6\u30e9\u30f3\u30c1\u3092 merge \u3057\u305f\u5834\u5408\u3067\u3082\u3001 push \u3055\u3048\u3057\u306a\u3051\u308c\u3070\u307e\u3060\u6bd4\u8f03\u7684\u7c21\u5358\u306b\u76f4\u3059\u65b9\u6cd5\u306f\u3042\u308a\u307e\u3059\u3002
\u57fa\u672c\u7684\u306b\u306f merge \u3057\u305f\u6642\u306b\u623b\u3059\u65b9\u6cd5\u3068\u540c\u3058\u3067\u3059\u304c\u3001\u3044\u304f\u3064\u304b\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n\n\n\n
mer<\/span>ge \u3057\u305f\u3082\u306e\u3092\u623b\u3059\u65b9\u6cd5<\/strong><\/p>\n\n\n\n
$git revert commitID<\/code><\/pre><\/div>\n\n\n
\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u65bd\u3057\u305f\u5909\u66f4\u306b\u5bfe\u3057\u3001\u3061\u3087\u3046\u3069\u6253\u3061\u6d88\u3059\u69d8\u306a\u30b3\u30df\u30c3\u30c8\u3092\u65b0\u3057\u304f\u4f5c\u6210\u3059\u308b\u3068\u3044\u3046\u3082\u306e\u3067\u3059\u3002
\u8ffd\u52a0\u3057\u305f\u3082\u306e\u306f\u3001\u524a\u9664\u3057\u305f\u3053\u3068\u306b\u3002\u5909\u66f4\u3092\u52a0\u3048\u305f\u3082\u306e\u306f\u3001\u5909\u66f4\u524d\u306e\u72b6\u614b\u306b\u6539\u3081\u3066\u5909\u66f4\u3057\u305f\u3053\u3068\u306b\u3002\u306e\u69d8\u306a\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002
\u65e2\u5b58\u306e\u30b3\u30df\u30c3\u30c8\u304c\u6b8b\u308a\u3001\u6253\u3061\u6d88\u3057\u305f\u5c65\u6b74\u3082\u6b8b\u308b\u306e\u3067\u3053\u3061\u3089\u3092\u4f7f\u7528\u3059\u308b\u306e\u304c\u4e00\u822c\u7684\u304b\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n
git pull \u3057\u305f\u3089\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u5834\u5408<\/strong><\/span><\/p>\n
git pull \u3092\u5b9f\u884c\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u969b\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3067\u30d6\u30e9\u30f3\u30c1\u304c merge \u3055\u308c\u308b\u524d\u306e\u72b6\u614b\u306b\u623b\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n\n\n
$ git merge --abort<\/code><\/pre><\/div>\n\n\n
\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u6642\u70b9\u304b\u3089\u7de8\u96c6\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306e\u307f\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\n
merge \u3057\u305f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3001\u7de8\u96c6\u3092\u52a0\u3048\u3066\u3057\u307e\u3063\u305f\u5834\u5408<\/strong><\/span><\/p>\n
merge \u3057\u305f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3001\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3057\u305f\u3042\u3068\u3067 merge \u3059\u308b\u524d\u306e\u72b6\u614b\u306b\u623b\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
$ git reset --head HEAD<\/code><\/pre><\/div>\n\n\n
\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u5f8c\u306b\u52a0\u3048\u305f\u7de8\u96c6\u3082\u542b\u3081\u3066 merge \u524d\u306e\u72b6\u614b\u306b\u623b\u308a\u307e\u3059\u3002
\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f revert \u3068\u306f\u9055\u3044\u30b3\u30df\u30c3\u30c8\u306e\u5c65\u6b74\u3082\u542b\u3081\u3066\u53d6\u308a\u6d88\u3057\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u305d\u306e\u305f\u3081\u3001\u5909\u66f4\u3092\u6253\u3061\u6d88\u3057\u305f\u306a\u3069\u306e\u5c65\u6b74\u3082\u6b8b\u308a\u307e\u305b\u3093\u3002
\u5c65\u6b74\u3092\u8ffd\u3044\u304b\u3051\u3066\u4fee\u5fa9\u3059\u308b\u3053\u3068\u3082 reset \u81ea\u4f53\u3092\u53d6\u308a\u6d88\u3059\u3053\u3068\u3082\u3067\u304d\u306a\u3044\u306e\u3067\u3001\u4f7f\u7528\u3059\u308b\u969b\u306b\u306f\u3088\u308a\u6ce8\u610f\u304c\u5fc5\u8981\u3067\u3059\u3002<\/p>\n\n\n
git pull \u306b\u95a2\u3059\u308b\u4e3b\u8981\u30aa\u30d7\u30b7\u30e7\u30f3<\/h2>\n\n\n
\u3053\u3053\u304b\u3089\u306f git pull \u306b\u95a2\u3059\u308b\u4e3b\u8981\u306a\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u7c21\u5358\u306b\u89e3\u8aac\u3057\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n
\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u969b\u306b\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3053\u3068\u3067\u3001\u901a\u5e38\u306e\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u3068\u306f\u5c11\u3057\u7570\u306a\u308b\u52d5\u4f5c\u3092\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n
git pull \u30b3\u30de\u30f3\u30c9\u306e\u4e3b\u8981\u306a\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u3001 –all \/ –rebase \/ –no-rebase \/ –no-commit \/ –no-ff \/ –verbose<\/strong> \u3067\u3059\u3002<\/p>\n
\u305d\u308c\u3067\u306f\u9806\u756a\u306b\u898b\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
\u3010–all\u3011<\/strong><\/p>\n\n\n\n
$ git pull --all<\/code><\/pre><\/div>\n\n\n
–all \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3068\u3001\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u306a\u3069\u306b\u95a2\u308f\u3089\u305a\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5b58\u5728\u3059\u308b\u3059\u3079\u3066\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u60c5\u5831\u3092 pull \u3057\u307e\u3059\u3002<\/p>\n\n\n
\u3010–rebase\u3011<\/strong><\/p>\n\n\n\n
$ git pull --rebase<\/code><\/pre><\/div>\n\n\n
–rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u305f\u5834\u5408\u3001 git pull \u30b3\u30de\u30f3\u30c9\u306e\u6319\u52d5\u306f fetch + merge \u3067\u306f\u306a\u304f fetch + rebase \u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n
rebase \u3092\u884c\u3046\u3068\u3001\u305d\u308c\u305e\u308c\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u304c\u7247\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u307e\u308c\u308b\u5f62\u3067\u30d6\u30e9\u30f3\u30c1\u304c\u518d\u7d71\u5408\u3055\u308c\u307e\u3059\u3002\u305d\u306e\u305f\u3081 merge \u3057\u305f\u5834\u5408\u306e\u3088\u3046\u306a\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u306f\u4f5c\u6210\u3055\u308c\u305a\u3001\u4f59\u8a08\u306a\u5c65\u6b74\u3082\u6b8b\u3089\u306a\u3044\u305f\u3081\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u6574\u7406\u3057\u306a\u304c\u3089\u958b\u767a\u3092\u9032\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n
\u305f\u3060\u3057\u3001\u5c65\u6b74\u304c\u66f8\u304d\u63db\u3048\u3089\u308c\u3066\u3057\u307e\u3046\u3053\u3068\u304b\u3089\u5927\u898f\u6a21\u306a\u958b\u767a\u3067\u306f\u30c1\u30fc\u30e0\u306e\u898f\u7d04\u3067\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u3082\u3042\u308a\u307e\u3059\u3002\u696d\u52d9\u3067\u306e\u5229\u7528\u306b\u306f\u3001\u4e8b\u524d\u306b\u78ba\u8a8d\u3092\u53d6\u308b\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
\u3010–no-rebase\u3011<\/strong><\/p>\n\n\n\n
$ git pull --no-rebase<\/code><\/pre><\/div>\n\n\n\n
–no-rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3053\u3068\u3067\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092 rebase \u3057\u306a\u3044\u3053\u3068\u3092\u660e\u793a\u3057\u307e\u3059\u3002\u5b9f\u8cea\u7684\u306a\u51e6\u7406\u306e\u5185\u5bb9\u3068\u3057\u3066\u306f git pull \u3092\u30aa\u30d7\u30b7\u30e7\u30f3\u306a\u3057\u3067\u5b9f\u884c\u3057\u305f\u5834\u5408\u3068\u307b\u307c\u5909\u308f\u308a\u307e\u305b\u3093\u304c\u3001 rebase \u3059\u308b\u3053\u3068\u306b\u3088\u3063\u3066\u751f\u3058\u308b\u30ea\u30b9\u30af\u3092\u56de\u907f\u3067\u304d\u308b\u305f\u3081\u3001\u5b89\u5168\u306b pull \u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n\n\n\n
\u3010–no-commit\u3011<\/strong><\/p>\n\n\n\n
$ git pull --no-commit<\/code><\/pre><\/div>\n\n\n
\u4e0a\u8a18\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001merge \u3057\u305f\u969b\u306e\u30b3\u30df\u30c3\u30c8\u3092\u65b0\u305f\u306b\u4f5c\u6210\u3057\u307e\u305b\u3093\u3002
merge \u3092\u884c\u3063\u305f\u5f8c\u306b\u6539\u3081\u3066\u8abf\u6574\u3057\u305f\u3044\u969b\u306a\u3069\u306b\u306f\u3053\u3061\u3089\u3092\u4f7f\u7528\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n
\u3010–no-ff\u3011<\/strong><\/p>\n\n\n\n
$ git pull --no-ff<\/code><\/pre><\/div>\n\n\n
\u3053\u3061\u3089\u306f –no-commit \u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u306f\u9006\u306b\u3001\u5fc5\u305a merge \u3057\u305f\u969b\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n\n\n
\u3010–verbose\u3011<\/strong><\/p>\n\n\n\n
$ git pull --verbose<\/code><\/pre><\/div>\n\n\n\n
git pull \u306e\u5b9f\u884c\u4e2d\u306b\u30bf\u30fc\u30df\u30ca\u30eb\u4e0a\u306b\u8a73\u7d30\u304c\u51fa\u529b\u3055\u308c\u308b\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u3059\u3002<\/p>\n\n\n\n
\u307e\u3068\u3081<\/h2>\n\n\n
git pull \u306e\u57fa\u672c\u7684\u306a\u4f7f\u3044\u65b9\u306b\u95a2\u3057\u3066\u89e3\u8aac\u3057\u3066\u304d\u307e\u3057\u305f\u3002<\/p>\n
\u3053\u306e\u8a18\u4e8b\u306e\u8981\u70b9\u306f\u4ee5\u4e0b\u306e\u3068\u304a\u308a\u3067\u3059\u3002<\/p>\n