{"id":37618,"date":"2023-04-10T01:19:21","date_gmt":"2023-06-11T21:35:47","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e6%80%bb%e7%bb%93\/"},"modified":"2024-04-29T22:45:39","modified_gmt":"2024-04-29T14:45:39","slug":"git%e7%9a%84%e6%80%bb%e7%bb%93","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e6%80%bb%e7%bb%93\/","title":{"rendered":"Git\u7684\u603b\u7ed3"},"content":{"rendered":"

\u7531\u4e8e\u6211\u7684\u8111\u5b50\u4e0d\u592a\u597d\uff0c\u6240\u4ee5\u6211\u628a\u4e00\u4e9b\u57fa\u672c\u7684\u4e1c\u897f\u8bb0\u4e0b\u6765\u3002<\/p>\n

Git\u7684\u6982\u5ff5<\/h1>\n

\u4e00\u5f00\u59cb\u6709\u4e09\u4e2a\u5730\u65b9\uff1a
\n1\u3001\u5de5\u4f5c\u76ee\u5f55
\n2\u3001\u7d22\u5f15
\n3\u3001\u4ed3\u5e93\uff08\u672c\u5730\u3001\u8fdc\u7a0b\uff09
\n\u5728\u8fd9\u4e09\u4e2a\u5730\u65b9\u8fdb\u884c\u5404\u79cd\u64cd\u4f5c\u3002\u6700\u7ec8\u5c06\u6587\u4ef6\u4fdd\u5b58\u5728\u4ed3\u5e93\u5185\u3002<\/p>\n

\u6307\u4ee4<\/h1>\n

\u8bbe\u5b9a<\/h3>\n
\n
git config -lgit\u306e\u8a2d\u5b9a\u3092\u78ba\u8a8d<\/div>\n<\/div>\n
\n
git config –global ******git\u306e\u8a2d\u5b9a
\nex) user.name, user.email, color.ui<\/div>\n<\/div>\n
\n
git config –global alias.\u7565\u8a9e [command]git\u30b3\u30de\u30f3\u30c9\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u8a2d\u5b9a\u3059\u308b\u3002
\nex) git config –global alias.m merge<\/div>\n<\/div>\n
\n
git config –helpgit\u8a2d\u5b9a\u306ehelp\u3092\u8868\u793a<\/div>\n<\/div>\n
\n

\u6587\u4ef6\u64cd\u4f5c<\/h3>\n
\n
git init\u4eca\u3044\u308b\u4f5c\u696ddir\u3067git\u4f7f\u3046\u3088\u30fc\u3063\u3066\u3044\u3046\u5ba3\u8a00<\/div>\n<\/div>\n
\n
git add [file]\u4f5c\u696ddir\u5185\u306e[file]\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8ffd\u52a0\u3002[file]\u3092.(\u30d4\u30ea\u30aa\u30c9)\u306b\u3059\u308c\u3070\u30ab\u30ec\u30f3\u30c8dir\u5185\u5168\u90e8\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u306b\u306a\u308b\uff0aadd\u3057\u305f\u304f\u306a\u3044\u30d5\u30a1\u30a4\u30eb(.log\u30d5\u30a1\u30a4\u30eb\u7b49)\u3092\u6307\u5b9a\u3059\u308b\u306b\u306f\u3001vim .gitignore<\/code>\u3067ignore\u7528\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u30fb\u5c55\u958b\u3057\u3001\u305d\u306e\u4e2d\u3067\u7121\u8996\u3057\u305f\u3044\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u6307\u5b9a\u3059\u308b<\/div>\n<\/div>\n
\n
git commit\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30b3\u30df\u30c3\u30c8\u3002option
\n-a: \u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u81ea\u52d5\u7684\u306b\u611f\u77e5\u3057\u3001add\u304b\u3089\u30b3\u30df\u30c3\u30c8\u307e\u3067\u5168\u90e8\u3084\u3063\u3066\u304f\u308c\u308b\u3002
\n-m: \u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u6307\u5b9a\u3057\u3066\u30b3\u30df\u30c3\u30c8\u3067\u304d\u308b\u3002-m\u306a\u3057\u3060\u3068vim\u304c\u7acb\u3061\u4e0a\u304c\u3063\u3066\u66f8\u304f\u4e8b\u306b\u306a\u308b\u3002
\n–amend: \u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5909\u66f4\u3059\u308b\u3002\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u7121\u99c4\u306b\u5897\u3084\u3057\u305f\u304f\u306a\u3044\u6642\u7b49\u306b\u4f7f\u3048\u308b\u3002<\/div>\n<\/div>\n
\n
git log\u30b3\u30df\u30c3\u30c8\u5c65\u6b74(\u30b3\u30df\u30c3\u30c8ID,\u88fd\u4f5c\u8005,\u65e5\u4ed8,\u30e1\u30c3\u30bb\u30fc\u30b8)\u3092\u8868\u793aoption
\n–oneline: \u7c21\u6613\u7684\u306a\u5c65\u6b74(ID\u4e0a7\u6841,\u30e1\u30c3\u30bb\u30fc\u30b8)\u3092\u8868\u793a\u3002
\n–stat: \u3069\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u4f55\u7b87\u6240\u5909\u66f4\u3057\u305f\u304b\u3082\u8868\u793a\u3002
\n-p: \u5909\u66f4\u3055\u308c\u305f\u7b87\u6240\u3082\u8868\u793a\u3002<\/div>\n<\/div>\n
\n
git status\u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u89a7\u8868\u793aoption
\n-s: \u8aac\u660e\u6587\u3092\u975e\u8868\u793a\u3002
\n-d: \u8aac\u660e\u6587\u3092\u975e\u8868\u793a\u3002\u30d6\u30e9\u30f3\u30c1\u540d\u306f\u8868\u793a\u3002<\/div>\n<\/div>\n
\n
git checkout — [file]\u4f5c\u696ddir\u5185\u3067\u306f\u5909\u66f4\u3057\u305f\u304c\u3001\u307e\u3060\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u306f\u4fdd\u5b58\u3057\u3066\u3044\u306a\u3044[file]\u3092\u5909\u66f4\u524d\u306b\u623b\u3059<\/div>\n<\/div>\n
\n
git diff\u4f5c\u696ddir\u5185\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u9055\u3044\u3092\u8868\u793aoption
\n–cached: \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u3068\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u9055\u3044\u3092\u8868\u793a\u3002<\/div>\n<\/div>\n
\n
git rm\/mv [file]\u666e\u901a\u306brm,mv\u3057\u3061\u3083\u3046\u3068git\u304c\u6df7\u4e71\u3059\u308b\u304b\u3089\u3001\u4e00\u5ea6git init\u3057\u305f\u4f5c\u696ddir\u5185\u3067\u306f\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3063\u3066\u30d5\u30a1\u30a4\u30eb\u64cd\u4f5c\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044<\/div>\n<\/div>\n
\n
git reset [target] [version][target]\u3092\u90e8\u5206\u3092[version]\u307e\u3067\u623b\u3059[target]
\n–soft: \u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u307f\u3002
\n(no option): \u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u3002
\n–hard: \u5168\u90e8(LocalRepo\u3082Index\u3082WorkingDir\u3082)[version]
\nID: \u30b3\u30df\u30c3\u30c8ID\u3067\u6307\u5b9a\u3002\u6700\u4f4e\u4e0a7\u6841\u3092\u542b\u3080\u3002
\nHEAD: \u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u6307\u5b9a\u3002
\nHEAD^: HEAD\u306e\u66f4\u306b\u4e00\u3064\u524d\u3002
\nORIG_HEAD: \u76f4\u524d\u306breset\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3002\u9593\u9055\u3048\u3066reset\u3057\u305f\u6642\u7b49\u306b\u5229\u7528\u3002<\/div>\n<\/div>\n
\n
git tag [tag] [commitID][commitID]\u3067\u6307\u5b9a\u3057\u305f\u30b3\u30df\u30c3\u30c8\u306b[tag]\u3092\u4ed8\u3051\u308b\u3053\u3068\u304c\u51fa\u6765\u308b\u3002
\nID\u3092\u6307\u5b9a\u3057\u306a\u304b\u3063\u305f\u5834\u5408\u3001\u76f4\u8fd1\u306e\u30b3\u30df\u30c3\u30c8(HEAD)\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u306b\u306a\u308b<\/div>\n<\/div>\n
\n
git tag\u30bf\u30b0\u306e\u4e00\u89a7\u3092\u8868\u793a\u3059\u308boption
\n-d [tag]: [tag]\u3092\u524a\u9664\u3059\u308b<\/div>\n<\/div>\n
\n
git show [tag][tag]\u30b3\u30df\u30c3\u30c8\u306e\u8a73\u7d30\u3092\u8868\u793a\u3059\u308b\u3002[tag]\u306fID\u3067\u3082\u53ef<\/div>\n<\/div>\n
\n

\u5206\u652f<\/h3>\n
\n
git branch\u4eca\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u78ba\u8a8d(\u30c7\u30d5\u30a9\u30eb\u30c8\u3067master)<\/div>\n<\/div>\n
\n
git branch [branch][branch]\u3092\u4f5c\u6210option
\n-d: [branch]\u3092\u524a\u9664\u3002<\/div>\n<\/div>\n
\n
git checkout [branch][branch]\u3078\u79fb\u52d5optional
\n-b [branch]: [branch]\u3092\u4f5c\u6210\u3057\u3001\u79fb\u52d5\u3002<\/div>\n<\/div>\n
\n
git merge [branch][branch]\u3092\u30ab\u30ec\u30f3\u30c8\u30d6\u30e9\u30f3\u30c1\u3078merge(\u6df7\u305c\u308b)<\/div>\n<\/div>\n
\n

\u516c\u5171\u5b58\u50a8\u5e93<\/h3>\n

\u5efa\u7acb\u5171\u4eab\u4ed3\u5e93\u65f6\uff0c\u6700\u57fa\u672c\u7684\u89c4\u5219\u662f\u5728\u76ee\u5f55\u540d\u79f0\u7684\u672b\u5c3e\u6dfb\u52a0.git\u3002<\/p>\n

\n
git init –bare\u5171\u6709\u30ea\u30dd\u30b8\u30c8\u30ea\u306egit\u5ba3\u8a00\u3092\u3059\u308b\u6642\u306foption\u3068\u3057\u3066–bare\u3092\u4ed8\u3051\u308b<\/div>\n<\/div>\n
\n
git remote\u5225\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u64cd\u4f5c\u3059\u308b\u969b\u306b\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9
\n\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u3057\u3066-v\u3092\u4ed8\u3051\u308b\u3068\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8a73\u7d30\u3092\u8868\u793a\u3059\u308b<\/div>\n<\/div>\n
\n
git remote add [repository] [position]\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea[repository]\u3092\u751f\u6210\u3059\u308b\u3002[position]\u3067\u6307\u5b9a\u3057\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u53c2\u7167\u3059\u308b\u3002URL([position])\u3055\u3048\u899a\u3048\u3066\u304a\u3051\u3070\u3084\u308b\u5fc5\u8981\u306f\u7121\u3044\u304c\u3001\u666e\u901a\u3084\u308b
\nex) git remote add origin https:\/\/github.com\/hogehoge\/gitTest.git<\/a>\uff0a\u30ea\u30dd\u30b8\u30c8\u30ea\u306eURL\u3092\u9593\u9055\u3048\u305f\u308a\u3059\u308b\u3068\u8a2d\u5b9a\u3057\u305fremote\u3092\u53d6\u308a\u6d88\u3057\u305f\u304f\u306a\u308b\u3002
\ngit remote -v: \u8a2d\u5b9a\u3057\u305f\u30ea\u30e2\u30fc\u30c8\u3092\u78ba\u8a8d
\ngit remote rm [repository]: \u6307\u5b9a\u3057\u305fremote\u8a2d\u5b9a\u3092\u524a\u9664
\n\u3067\u53d6\u308a\u6d88\u3059\u3053\u3068\u304c\u3067\u304d\u308b\u3002<\/div>\n<\/div>\n
\n
git remote rm [repository]\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea[repository]\u3092\u524a\u9664\u3059\u308b<\/div>\n<\/div>\n
\n
git push [repository] master\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea[repository]\u306b\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u3002\u30ed\u30fc\u30ab\u30eb\u306emaster\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u306emaster\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u3066\u3044\u308b<\/div>\n<\/div>\n
\n
git clone [remoteRepository] [workingDir][remoteRepository]\u306e\u4e2d\u8eab\u3092\u65b0\u305f\u306a\u4f5c\u696ddir[workingDir]\u3068\u3057\u3066\u8907\u88fd\u3059\u308b\u3002
\n\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\u30ea\u30f3\u30af\u3082\u305d\u306e\u307e\u307e\u5f15\u304d\u7d99\u3050
\nex) git clone ~\/origDir\/ cloneDir<\/div>\n<\/div>\n
\n
git fetch\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u30ea\u30e2\u30fc\u30c8\u8ffd\u8de1\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30d4\u30fc\u3059\u308b<\/div>\n<\/div>\n
\n
git pull [remoteRepository] master[remoteRepository]\u306e\u30d6\u30e9\u30f3\u30c1master\u304b\u3089\u30d7\u30eb(\u30d7\u30c3\u30b7\u30e5\u306e\u9006)\u3002fetch\u3068merge\u3092\u7d44\u307f\u5408\u308f\u305b\u305f\u69d8\u306a\u3082\u306egit fetch
\ngit merge origin\/master
\n\u3068\u540c\u3058<\/div>\n<\/div>\n

\u6ce8\u610f\u4e8b\u9879<\/h2>\n

\u5728\u8fdb\u884c\u5408\u5e76\uff08merge\uff09\u6216\u63a8\u9001\uff08push\uff09\u65f6\uff0c\u7ecf\u5e38\u4f1a\u51fa\u73b0\u51b2\u7a81\uff08conflict\uff09\uff0c\u53ef\u80fd\u662f\u56e0\u4e3a\u5176\u4ed6\u4eba\u6b63\u5728\u4fee\u6539\u76f8\u540c\u7684\u90e8\u5206\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u62c9\u53d6\uff08pull\uff09\u3001\u83b7\u53d6\uff08fetch\uff09\u6216\u53d8\u57fa\uff08rebase\uff09\u6765\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\u3002<\/p>\n

\u8bf7\u63d0\u4f9b\u4e00\u4e2a\u53c2\u8003\u7f51\u5740<\/h1>\n

\u30fb\u5373\u4f7f\u662f\u7334\u5b50\u4e5f\u80fd\u660e\u767d\u7684git\u5165\u95e8\u6559\u7a0b\uff1a
\nhttp:\/\/www.backlog.jp\/git-guide\/
\n\u30fbgit pull\u7684\u89e3\u91ca\uff1a<\/p>\n

git pull \u3068 git pull –rebase \u306e\u9055\u3044\u3063\u3066\uff1f\u56f3\u3092\u4ea4\u3048\u3066\u8aac\u660e\u3057\u307e\u3059\uff01<\/a><\/p><\/blockquote>\n