\u6211\u4f1a\u603b\u7ed3\u5e38\u7528\u7684Git\u547d\u4ee4\u548c\u5907\u5fd8\u5f55\u3002
\n\u4f5c\u4e3a\u81ea\u6211\u8f93\u51fa\u7684\u4e00\u90e8\u5206\uff0c\u6211\u5c06\u521b\u5efa\u4e00\u4e2aGit\u901f\u67e5\u8868\u3002
\n\u3010\u5982\u679c\u6709\u9700\u8981\uff0c\u6211\u4f1a\u6301\u7eed\u66f4\u65b0\u3002\u3011<\/p>\n
# \u30b0\u30ed\u30fc\u30d0\u30eb\u306e\u8a2d\u5b9a\u7de8\u96c6\r\n$ git config --global --edit\r\n\r\n\r\n# \u8a2d\u5b9a\u78ba\u8a8d\r\n$ git config --list\r\n\r\n# \u3082\u3057\u304f\u306f\u3053\u308c\r\n$ cat ~\/.gitconfig\r\n<\/code><\/pre>\n\u5efa\u7acb\u4ed3\u5e93<\/h3>\n# \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u65b0\u898f\u4f5c\u6210(.git\u304c\u4f5c\u6210\u3055\u308c\u308b)\r\n$ git init\r\n<\/code><\/pre>\n# git\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30af\u30ed\u30fc\u30f3\u3092\u4f5c\u6210\r\n$ git clone <\u30ea\u30dd\u30b8\u30c8\u30ea\u306eURL>\r\n<\/code><\/pre>\n\u6dfb\u52a0\u5230\u821e\u53f0\u4e0a<\/h3>\n
git add \u662f\u5c06\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u4e2d\u3002
\n\u4e3a\u63d0\u4ea4\u505a\u51c6\u5907\u7684\u4fee\u6539\u64cd\u4f5c\u3002
\n\u751f\u6210\u538b\u7f29\u6587\u4ef6\u5e76\u5c06\u4fe1\u606f\u6620\u5c04\u5230\u7d22\u5f15\u6587\u4ef6\u4e2d\u3002<\/p>\n
# \u5909\u66f4\u3092\u30b9\u30c6\u30fc\u30b8\u306b\u8ffd\u52a0\u3059\u308b\r\n$ git add <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n$ git add <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n$ git add .\r\n<\/code><\/pre>\n\u63d0\u4ea4<\/h3>\n
\u5c06\u66f4\u6539\u8bb0\u5f55\u5230\u5b58\u50a8\u5e93 = \u63d0\u4ea4\u3002
\n\u6839\u636e\u7d22\u5f15\u6587\u4ef6\u751f\u6210\u6811\u6587\u4ef6\u548c\u521b\u5efa\u63d0\u4ea4\u6587\u4ef6\u3002<\/p>\n
# \u30b3\u30df\u30c3\u30c8\u3059\u308b\r\n$ git commit\r\n$ git commit -m \"\u30e1\u30c3\u30bb\u30fc\u30b8\"\r\n\r\n#\u3000\u5909\u66f4\u5185\u5bb9\u3082\u78ba\u8a8d\u3067\u304d\u308b\r\n$ git commit -v\r\n<\/code><\/pre>\n\u5199\u63d0\u4ea4\u4fe1\u606f\u7684\u65b9\u5f0f\u3002<\/h3>\n
\u5728\u8868\u8fbe\u53d8\u66f4\u5185\u5bb9\u7684\u8981\u70b9\u548c\u53d8\u66f4\u7406\u7531\u65f6\uff0c\u539f\u5219\u4e0a\u9700\u8981\u9075\u5faa\u4ee5\u4e0b\u51e0\u70b9\uff1a
\n\u7b80\u5355\u63cf\u8ff0\u65f6\uff0c\u53ef\u5c06\u5176\u5199\u5728\u4e00\u884c\u5185\u3002
\n\u6b63\u5f0f\u63cf\u8ff0\u65f6\uff0c\u9700\u8981\u4e25\u8c28\u8868\u8fbe\uff0c\u4ee5\u7b26\u5408\u8981\u6c42\u3002<\/p>\n
1\u884c\u76ee:\u5909\u66f4\u5185\u5bb9\u306e\u8981\u7d04\r\n2\u884c\u76ee:\u7a7a\u884c\r\n3\u884c\u76ee:\u5909\u66f4\u3057\u305f\u7406\u7531\r\n<\/code><\/pre>\n\u5728\u63d0\u4ea4\u6216\u8005\u6682\u5b58\u4e4b\u524d\uff0c\u786e\u8ba4\u4e86\u505a\u4e86\u54ea\u4e9b\u4fee\u6539\u3002<\/h3>\n
\u786e\u8ba4\u53d8\u66f4\u7684\u5dee\u5f02\u3002\u4ee5difference\u7f29\u7565\u3002<\/p>\n
# git add\u3059\u308b\u524d\u306e\u5909\u66f4\u5206(\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3068\u30b9\u30c6\u30fc\u30b8\u306e\u9593\u306e\u5909\u66f4\u5dee\u5206)\r\n$ git diff\r\n$ git diff <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n\r\n# git add\u3057\u305f\u5f8c\u306e\u5909\u66f4\u5206(\u30b9\u30c6\u30fc\u30b8\u3068\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5909\u66f4\u5dee\u5206)\r\n$ git diff --staged\r\n<\/code><\/pre>\n\u67e5\u770b\u66f4\u6539\u5386\u53f2<\/h3>\n# \u5c65\u6b74\u306e\u78ba\u8a8d\r\n$ git log\r\n\r\n# \uff11\u884c\u3067\u898b\u3084\u3059\u304f\u8868\u793a\r\n$ git log --oneline\r\n\r\n# \u7279\u5b9a\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u5dee\u5206\u3092\u8868\u793a\u3059\u308b\r\n$ git log -p <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n\r\n# \u8868\u793a\u3059\u308b\u30b3\u30df\u30c3\u30c8\u306e\u6570\u3092\u5236\u9650\u3059\u308b\r\n$ git log -n <\u8868\u793a\u3059\u308b\u6570>\r\n<\/code><\/pre>\n\u8bb0\u5f55\u6587\u4ef6\u5220\u9664<\/h3>\n
\u4e0d\u4f7f\u7528git add\u3002
\n\u7f29\u5199\u4e3aremove\u3002<\/p>\n
# git\u306e\u8a18\u9332\u304b\u3089(\u3059\u3067\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb)\u3082\u6d88\u3048\u308b\u3057\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u304b\u3089\u3082\u6d88\u3059\u65b9\u6cd5\r\n# \u30d5\u30a1\u30a4\u30eb\u3054\u3068\u524a\u9664\r\n$ git rm <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n# \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3054\u3068\u524a\u9664\r\n$ git rm -r <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n\r\n# \u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u6b8b\u3057\u305f\u3044\u6642\r\n$ git rm --cached <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n\u8bb0\u5f55\u6587\u4ef6\u7684\u79fb\u52a8<\/h3>\n# \u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5\u3092\u8a18\u9332\u3059\u308b\r\n$ git mv <\u65e7\u30d5\u30a1\u30a4\u30eb><\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n\r\n# \u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3068\u540c\u3058\r\n$ mv <\u65e7\u30d5\u30a1\u30a4\u30eb><\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n$ git rm <\u65e7\u30d5\u30a1\u30a4\u30eb>\r\n$ git add <\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n<\/code><\/pre>\n\u65b0\u589e\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n$ git remote add <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30ea\u30e2\u30fc\u30c8\u306eURL>\r\n\r\n# origin\u3068\u3044\u3046\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u3067\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u767b\u9332\u3059\u308b\r\n# \u4eca\u5f8c\u306f\u3001origin\u3068\u3044\u3046\u540d\u524d\u3067push\u3084pull\u304c\u884c\u3048\u308b\r\n$ git remote add origin https:\/\/github.com\/user\/\u3007\u3007\r\n<\/code><\/pre>\n\u663e\u793a\u4e3a\u8fdc\u7a0b<\/h3>\n$ git remote\r\n\r\n# \u5bfe\u5fdc\u3059\u308bURL\u3082\u8868\u793a\u3055\u305b\u308b\u306e\u3067\u3042\u308c\u3070\r\n$ git remote -v\r\n<\/code><\/pre>\n\u8fdc\u7a0b\u4fee\u6539\u6216\u5220\u9664<\/h3>\n
\u5f53\u4f60\u60f3\u8981\u66f4\u6539\u8fdc\u7a0b\u540d\u79f0\u6216\u8005\u4e0d\u518d\u9700\u8981\u4f7f\u7528\u8fdc\u7a0b\u65f6<\/p>\n
# \u30ea\u30e2\u30fc\u30c8\u540d\u306e\u5909\u66f4\r\n$ git remote rename <\u65e7\u30ea\u30e2\u30fc\u30c8\u540d><\u65b0\u30ea\u30e2\u30fc\u30c8\u540d>\r\n\r\n# \u30ea\u30e2\u30fc\u30c8\u306e\u524a\u9664\r\n$ git remote rm <\u30ea\u30e2\u30fc\u30c8\u540d>\r\n<\/code><\/pre>\n\u5c06\u4ee3\u7801\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/h3>\n$ git push <\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d><\u30d6\u30e9\u30f3\u30c1\u540d>\r\n\r\n# \u4f8b\u3048\u3070\r\n# \u30ed\u30fc\u30ab\u30eb\u306emaster\u30d6\u30e9\u30f3\u30c1\u3092\u3001\u767b\u9332\u3057\u305f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u306eorigin\u306bpush\u3059\u308b\r\n$ git push origin master\r\n<\/code><\/pre>\n# git push -u\u30b3\u30de\u30f3\u30c9\u306b\u3064\u3044\u3066\r\n# \u6b21\u56de\u4ee5\u964d git push\u3060\u3051\u3067\u52dd\u624b\u306borigin master\u3067push\u3057\u3066\u304f\u308c\u308b\r\n<\/code><\/pre>\n\u4e0d\u60f3\u8fdb\u884c\u7248\u672c\u7ba1\u7406.gitignore<\/h3>\n
\u2022 \u8a18\u5f55\u4e86\u5bc6\u7801\u7b49\u673a\u5bc6\u4fe1\u606f\u7684\u6587\u4ef6\uff08\u9700\u8c28\u614e\u5904\u7406AWS\u7684\u5bc6\u7801\u7b49\u76f8\u5173\u4fe1\u606f\uff09
\n\u2022 \u5728\u56e2\u961f\u5f00\u53d1\u4e2d\u4e0d\u9700\u8981\u7684\u4e1c\u897f\uff08\u5982\u81ea\u52a8\u751f\u6210\u7684\u6587\u4ef6\u548c\u7f13\u5b58\uff09<\/p>\n
.gitignore\u6587\u4ef6\u672c\u8eab\u53ef\u4ee5\u6309\u7167\u5e38\u89c4\u65b9\u6cd5\u521b\u5efa
\n.gitignore\u7684\u7f16\u5199\u65b9\u5f0f<\/p>\n
# #\u306f\u30b3\u30e1\u30f3\u30c8\r\n\r\n# \u6307\u5b9a\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u9664\u5916\r\nindex.html\r\n\r\n# \u30eb\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\r\n\/root.html\r\n\r\n# \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u3092\u9664\u5916\r\ndir\/\r\n\r\n# \u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9\r\n# \u4f8b\uff1a\u4e00\u3064\u968e\u5c64\u3092\u6f5c\u3063\u305f\u4efb\u610f\u306ecss\u30d5\u30a1\u30a4\u30eb\r\n\/*\/*.css\r\n<\/code><\/pre>\n\u64a4\u9500\u6587\u4ef6\u7684\u66f4\u6539\u65b9\u6cd5\u3002<\/h2>\n
(Note: The translation provided is in Simplified Chinese)<\/p>\n
\u5c06\u5de5\u4f5c\u6811\u7684\u66f4\u6539\u6062\u590d\u5230\u4e4b\u524d\u7684\u72b6\u6001<\/h3>\n
\u901a\u8fc7\u4ece\u5de5\u4f5c\u6811\u83b7\u53d6\u821e\u53f0\u4fe1\u606f\uff0c\u5c06\u5176\u6062\u590d\u4e3a\u539f\u59cb\u72b6\u6001\u3002<\/p>\n
# \u30d6\u30e9\u30f3\u30c1\u540d\u3068\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u304b\u3076\u3063\u305f\u6642\u306b\u3001\u3069\u3061\u3089\u3092\u3057\u3066\u3044\u308b\u306e\u304bGit\u304c\u308f\u304b\u3089\u306a\u304f\u306a\u308b\u304b\u3089\u3010--\u3011\u3092\u4f7f\u3046\r\n$ git checkout -- <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n$ git checkout -- <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n\r\n# \u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\r\n$ git checkout -- .\r\n<\/code><\/pre>\n\u53d6\u6d88\u5df2\u8fdb\u884c\u7684\u9636\u6bb5\u66f4\u6539<\/h3>\n
\u901a\u8fc7\u83b7\u53d6\u5b58\u50a8\u5e93\u7684\u4fe1\u606f\u5e76\u901a\u8fc7\u8986\u76d6\u53d8\u66f4\u90e8\u5206\u6765\u64a4\u9500\u821e\u53f0\u7684\u4fee\u6539\u3002\u7531\u4e8eHEAD\u6307\u5411\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u6240\u4ee5\u4f7f\u7528\u6700\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\u8fdb\u884c\u91cd\u7f6e\u3002<\/p>\n
$ git reset HEAD <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n$ git reset HEAD <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n\r\n# \u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059(\u305f\u3076\u3093\u4f7f\u3046\u6a5f\u4f1a\u306f\u305d\u3046\u305d\u3046\u306a\u3044)\r\n$ git reset HEAD .\r\n<\/code><\/pre>\n\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u7531\u4e8e\u53ea\u662f\u4ece\u821e\u53f0\u4e0a\u53d6\u6d88\u6307\u5b9a\u7684\u66f4\u6539\uff0c\u6240\u4ee5\u4e0d\u4f1a\u5f71\u54cd\u5de5\u4f5c\u533a\u3002
\n\u6362\u53e5\u8bdd\u8bf4\uff0c\u5982\u679c\u8981\u540c\u65f6\u64a4\u6d88\u5de5\u4f5c\u533a\u7684\u66f4\u6539\uff0c\u9700\u8981\u8fdb\u884c\u4ee5\u4e0b\u64cd\u4f5c\u3002<\/p>\n
$ git reset HEAD <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n$ git reset checkout -- <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n\u5c06\u6700\u8fd1\u7684\u63d0\u4ea4\u89c6\u4e3a\u6ca1\u6709\u53d1\u751f\u8fc7\u3002<\/h3>\n
\u5c06\u7f16\u8f91\u5185\u5bb9\u5168\u90e8\u89c6\u4f5c\u4e0d\u5b58\u5728<\/p>\n
$ git reset --hard HEAD^\r\n<\/code><\/pre>\n\u4fee\u6539\/\u8986\u76d6\u6700\u8fd1\u7684\u63d0\u4ea4<\/h3>\n
\u4fee\u8ba2\u7684\u542b\u4e49\uff1a\u8fdb\u884c\u4fee\u6539\/\u6539\u5584\u3002<\/p>\n
$ git commit --amend\r\n<\/code><\/pre>\n\u6ce8\u610f\u4e8b\u9879\uff1a\u4e0d\u8981\u53d6\u6d88\u5df2\u7ecf\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u63d0\u4ea4\uff01<\/p>\n
\u4f7f\u7528\u8fd9\u4e2a\u539f\u7406\uff0c\u53ef\u4ee5\u5728\u8f93\u5165\u4e0a\u8ff0\u547d\u4ee4\u65f6\u4fee\u6539\u524d\u4e00\u4e2a\u9636\u6bb5\u7684\u4fe1\u606f\u3002
\n\u8fd9\u6837\u4e00\u6765\uff0c\u4e0d\u4ec5\u53ef\u4ee5\u6539\u53d8\u63d0\u4ea4\u4fe1\u606f\uff0c\u8fd8\u53ef\u4ee5\u4fee\u6539\u63d0\u4ea4\u7684\u5185\u5bb9\u3002\u7b80\u8a00\u4e4b<\/p>\n
# \u30b3\u30df\u30c3\u30c8\u3059\u308b\r\n$ git commmit -m \"html\u3092\u5909\u66f4\u3057\u307e\u3057\u305f\"\r\n\r\n# \u30b3\u30df\u30c3\u30c8\u5185\u5bb9\u3092\u9593\u9055\u3048\u305f\uff01\u3068\u306a\u3063\u305f\u3068\u3059\u308b\r\n# \u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u3066\u8a72\u5f53\u7b87\u6240\u3092\u5909\u66f4\u3057\u3066\u3001git add\u3067\u3001\u30b9\u30c6\u30fc\u30b8\u306b\u3042\u3052\u308b\r\n# \u30b9\u30c6\u30fc\u30b8\u306e\u72b6\u614b\u304c\u4fee\u6b63\u3055\u308c\u305f\u3089\u3001\u3053\u3053\u3067\r\n$ git commit --amend\r\n\r\n# \u30b3\u30df\u30c3\u30c8\u306e\u5185\u5bb9\u3092\u4fee\u6b63\u3067\u304d\u308b\r\n\r\n<\/code><\/pre>\n\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/h3>\n
\u548c\u4e0a\u8005\u4e00\u8d77<\/p>\n
$ git commit --amend\r\n<\/code><\/pre>\n\u53d6\u6d88\u63d0\u4ea4<\/h3>\n
\u5e76\u975e\u5c06\u63d0\u4ea4\u89c6\u4f5c\u672a\u53d1\u751f\uff0c\u800c\u662f\u7559\u4e0b\u76f8\u53cd\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002<\/p>\n
$ git revert <\u30cf\u30c3\u30b7\u30e5\u5024>\r\n<\/code><\/pre>\n\u4ece\u8fdc\u7a0b\u83b7\u53d6\u4fe1\u606f\u3002<\/h2>\n\u83b7\u53d6(\u30d5\u30a7\u30c3\u30c1)<\/h3>\n
\u4ece\u672c\u5730\u83b7\u53d6\u4fe1\u606f\u3002<\/p>\n
$ git fetch <\u30ea\u30e2\u30fc\u30c8\u540d>\r\n\r\n# \u5f15\u3063\u5f35\u3063\u3066\u304d\u305f\u30d6\u30e9\u30f3\u30c1\u306f\u4ee5\u4e0b\u3067\u78ba\u8a8d\r\n$ git branch -a\r\n<\/code><\/pre>\n\u5408\u5e76<\/h3>\n# \u73fe\u5728\u306e\u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\r\n# \u30b9\u30e9\u30c3\u30b7\u30e5(\/)\u5fd8\u308c\u308b\u306a\r\n$ git merge <\u30ea\u30e2\u30fc\u30c8\u540d\/\u5f15\u3063\u5f35\u3063\u3066\u304d\u305f\u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n\u62c9\uff08\u52a8\u4f5c\uff09<\/h3>\n
\u5728\u5f53\u524d\u5206\u652fpull\u5e76\u4e14fetch\u548cmerge\u4e00\u8d77\u8fdb\u884c\uff0c\u9700\u8981\u6ce8\u610f\u56e0\u4e3a\u5b83\u4f1a\u83b7\u53d6\u5230\u5df2\u7ecfpull\u5230\u5f53\u524d\u5206\u652f\u7684\u4fe1\u606f\u3002<\/p>\n
$ git pull <\u30ea\u30e2\u30fc\u30c8\u540d><\u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u540d>\r\n\r\n#\u3088\u304f\u4f7f\u3046\u306e\u306f\r\n$ git pull origin master\r\n<\/code><\/pre>\n\u90a3\u4e48\uff0cfetch\u548cpull\u8981\u5982\u4f55\u533a\u522b\u4f7f\u7528\u5462\uff1f<\/h3>\n
\u6211\u4e2a\u4eba\u8ba4\u4e3a\u4f7f\u7528fetch\u66f4\u52a0\u53ef\u9760\u3002
\n\u56e0\u4e3a\u4f7f\u7528pull\u65f6\u4f1a\u5c06\u62c9\u53d6\u7684\u4fe1\u606f\u76f4\u63a5\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\uff0c\u5982\u679c\u6ca1\u6709\u610f\u8bc6\u5230\u53ef\u80fd\u4f1a\u8bef\u5c06\u5176\u5408\u5e76\u5230\u4e0d\u6253\u7b97\u7684\u5206\u652f\u4e2d\u3002
\n\u5f53\u4e0d\u5c0f\u5fc3\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u65f6\u8981\u683c\u5916\u6ce8\u610f\u3002<\/p>\n
\u51b2\u7a81\u76f8\u5173<\/h2>\n\u5982\u679c\u53d1\u751f\u51b2\u7a81<\/h3>\n# \u307e\u305a\u72b6\u6cc1\u78ba\u8a8d\r\n$ git status\r\n\r\n# \u305d\u3057\u305f\u3089\u4ee5\u4e0b\u307f\u305f\u3044\u306a\u8868\u793a\r\nboth modified: <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n\r\n# \u3053\u3053\u306b\u66f8\u304b\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b\r\n# \u89e3\u6d88\u65b9\u6cd5:\u6700\u7d42\u7684\u306a\u5f62\u3092\u4f5c\u3063\u3066\u3001\u5fc5\u8981\u306a\u3044\u3082\u306e\u3092\u524a\u9664\r\n# \u305d\u306e\u5f8c\u30b9\u30c6\u30fc\u30b8\u306b\u4e0a\u3052\u3066\u3001\u518d\u30b3\u30df\u30c3\u30c8\r\n# \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u8a73\u7d30\u306b\"\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6d88\"\u7b49\u3092\u66f8\u3044\u3066\u304a\u304f\r\n<\/code><\/pre>\n\u5c3d\u91cf\u907f\u514d\u53d1\u751f\u51b2\u7a81\u7684\u64cd\u4f5c\u89c4\u5219<\/h3>\n\n- \n
\u8907\u6570\u4eba\u3067\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3057\u306a\u3044<\/ul>\n<\/li>\n<\/ul>\n <\/p>\n
\n- \n
pull\u3084merge\u524d\u306b\u5909\u66f4\u4e2d\u306e\u72b6\u614b\u3092\u306a\u304f\u3059<\/ul>\n<\/li>\n<\/ul>\ncommit\u3084stash\u3057\u3066\u304a\u304f<\/p>\n
pull\u3059\u308b\u969b\u306f\u3001pull\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066\u304b\u3089pull
\n(\u5fc3\u69cb\u3048)\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3082\u614c\u3066\u306a\u3044<\/p>\n
\u72b6\u6cc1\u78ba\u8a8d\u3057\u3066\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3057\u3066\u3001\u30b9\u30c6\u30fc\u30b8\u306b\u4e0a\u3052\u3066\u3001\u30b3\u30df\u30c3\u30c8<\/p>\n
\u5206\u652f\u76f8\u5173 zh\u012b<\/h2>\n\u5982\u4f55\u5207\u5206\u652f<\/h3>\n# \u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u3001\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3082\u540c\u6642\u306b\u884c\u3046\r\n$ git checkout -b <\u65b0\u3057\u304f\u4f5c\u308b\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n\u66f4\u6539\u5206\u652f\u540d\u79f0<\/h3>\n# \u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5909\u66f4\r\n# \u30d6\u30e9\u30f3\u30c1\u540d\u3092\u5909\u66f4\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066\u304b\u3089\u884c\u3046\u3000\r\n$ git branch -m <\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n\u5220\u9664\u5206\u652f<\/h3>\n# \u30d6\u30e9\u30f3\u30c1\u306e\u524a\u9664\r\n# mater\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u6b8b\u3063\u3066\u3044\u308b\u5834\u5408\u3001\u524a\u9664\u3055\u308c\u306a\u3044\r\n$ git branch -d <\u524a\u9664\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u540d>\r\n\r\n# \u5f37\u5236\u7684\u306b\u6d88\u3059\u306b\u306f\r\n$ git branch -D <\u524a\u9664\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n\u8fdc\u7a0b\u5206\u652f<\/h3>\n
\u6307\u5411\u8fdc\u7a0b\u5206\u652f\u72b6\u6001\u7684\u6307\u9488<\/p>\n
# \u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u53c2\u7167\u306f\u4ee5\u4e0b\r\n# (\/)\u30b9\u30e9\u30c3\u30b7\u30e5\u3092\u4f7f\u3046\r\n<\u30ea\u30e2\u30fc\u30c8>\/<\u30d6\u30e9\u30f3\u30c1>\r\n<\/code><\/pre>\n\u91cd\u6784\u76f8\u5173<\/h2>\n\u91cd\u5199\u4ee5\u4e0a\u5185\u5bb9\u7684\u4e2d\u6587\u7248\u672c\uff1a<\/h3>\n
\u91cd\u65b0\u57fa\u7840\u7684\u6d41\u7a0b<\/p>\n
# \u89aa\u30b3\u30df\u30c3\u30c8\u304c\u540c\u3058feature\u3068master\u304c\u3042\u308b\u5834\u5408\u3001\r\n# feature\u306e\u89aa\u30b3\u30df\u30c3\u30c8\u3092master\u3068\u3057\u3066merge\u3057\u305f\u3044\u6642\r\n$ git checkout feature\r\n$ git rebase master\r\n$ git checkout master\r\n$ git merge feature\r\n<\/code><\/pre>\n\u8bf7\u63d0\u4f9b\u66f4\u591a\u4e0a\u4e0b\u6587\u3002\u201d\u30d7\u30eb\u306e\u30ea\u30d9\u30fc\u30b9\u578b\u201d \u53ef\u4ee5\u6709\u4e0d\u540c\u7684\u7ffb\u8bd1\uff0c\u4ee5\u4e0b\u662f\u4e00\u79cd\u53ef\u80fd\u7684\u7ffb\u8bd1:<\/h3>\n
\u62c9\u52a8\u7684\u91cd\u7ec4\u6a21\u5f0f<\/p>\n
# \u30d7\u30eb\u3059\u308b\u6642\u306b\u30ea\u30d9\u30fc\u30b9\u3067\u60c5\u5831\u3092\u53d6\u5f97\u3059\u308b\r\n$ git pull --rebase <\u30ea\u30e2\u30fc\u30c8\u540d><\u30d6\u30e9\u30f3\u30c1\u540d>\r\n\r\n# \u4f8b\u3048\u3070\r\n$ git pull --rebase origin master\r\n<\/code><\/pre>\n\u4ee5\u4e0b\u662f\u300c\u30b9\u30bf\u30c3\u30b7\u30e5\u76f8\u5173\u300d\u7684\u4e2d\u6587\u91ca\u4e49\uff1a<\/h2>\n
– “\u81f4\u529b\u4e8e\u6536\u96c6\u3001\u5b58\u50a8\u548c\u7ba1\u7406\u6f6e\u6d41\u6587\u5316\u4ea7\u54c1\u7684\u76f8\u5173\u4e8b\u52a1”<\/p>\n
\u5c06\u4f5c\u4e1a\u6682\u65f6\u6401\u7f6e<\/h3>\n$ git stash\r\n$ git stash save\r\n\r\n# \u4e00\u89a7\u3067\u78ba\u8a8d\r\n$ git stash list\r\n<\/code><\/pre>\n\u6062\u590dStash<\/h3>\n# \u6700\u65b0\u306e\u4f5c\u696d\u3092\u5fa9\u5143\u3059\u308b\r\n$ git stash apply\r\n\r\n# \u30b9\u30c6\u30fc\u30b8\u306e\u72b6\u6cc1\u3082\u5fa9\u5143\u3059\u308b\r\n$ git stash apply --index\r\n\r\n# \u7279\u5b9a\u306e\u4f5c\u696d\u3092\u5fa9\u5143\u3059\u308b\r\n$ git stash apply [\u30b9\u30bf\u30c3\u30b7\u30e5\u540d]\r\n<\/code><\/pre>\n\u5220\u9664\u5b58\u50a8<\/h3>\n# \u6700\u65b0\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n$ git stash drop\r\n\r\n# \u7279\u5b9a\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n$ git stash drop [\u30b9\u30bf\u30c3\u30b7\u30e5\u540d]\r\n\r\n# \u5168\u4f5c\u696d\u306e\u524a\u9664\r\n$ git stash clear\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"Git\u7684\u901f\u67e5\u8868\u6c47\u603b \u6211\u4f1a\u603b\u7ed3\u5e38\u7528\u7684Git\u547d\u4ee4\u548c\u5907\u5fd8\u5f55\u3002 \u4f5c\u4e3a\u81ea\u6211\u8f93\u51fa\u7684\u4e00\u90e8\u5206\uff0c\u6211\u5c06\u521b\u5efa\u4e00\u4e2aGit\u901f\u67e5\u8868\u3002 \u3010\u5982 […]<\/p>\n","protected":false},"author":9,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37642","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n
Git\u7684\u5907\u5fd8\u5355 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u5907\u5fd8\u5355\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u7684\u5907\u5fd8\u5355\" \/>\n<meta property=\"og:description\" content=\"Git\u7684\u901f\u67e5\u8868\u6c47\u603b \u6211\u4f1a\u603b\u7ed3\u5e38\u7528\u7684Git\u547d\u4ee4\u548c\u5907\u5fd8\u5f55\u3002 \u4f5c\u4e3a\u81ea\u6211\u8f93\u51fa\u7684\u4e00\u90e8\u5206\uff0c\u6211\u5c06\u521b\u5efa\u4e00\u4e2aGit\u901f\u67e5\u8868\u3002 \u3010\u5982 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u5907\u5fd8\u5355\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-09-18T02:31:29+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T11:56:02+00:00\" \/>\n<meta name=\"author\" content=\"\u6e05, \u626c\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6e05, \u626c\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/\",\"name\":\"Git\u7684\u5907\u5fd8\u5355 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-09-18T02:31:29+00:00\",\"dateModified\":\"2024-04-29T11:56:02+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u7684\u5907\u5fd8\u5355\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461\",\"name\":\"\u6e05, \u626c\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u626c\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u7684\u5907\u5fd8\u5355 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u5907\u5fd8\u5355\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u7684\u5907\u5fd8\u5355","og_description":"Git\u7684\u901f\u67e5\u8868\u6c47\u603b \u6211\u4f1a\u603b\u7ed3\u5e38\u7528\u7684Git\u547d\u4ee4\u548c\u5907\u5fd8\u5f55\u3002 \u4f5c\u4e3a\u81ea\u6211\u8f93\u51fa\u7684\u4e00\u90e8\u5206\uff0c\u6211\u5c06\u521b\u5efa\u4e00\u4e2aGit\u901f\u67e5\u8868\u3002 \u3010\u5982 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u5907\u5fd8\u5355\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-09-18T02:31:29+00:00","article_modified_time":"2024-04-29T11:56:02+00:00","author":"\u6e05, \u626c","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u626c","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/","name":"Git\u7684\u5907\u5fd8\u5355 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-09-18T02:31:29+00:00","dateModified":"2024-04-29T11:56:02+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u7684\u5907\u5fd8\u5355"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/cb5556d2501da73d864cac945e8d9461","name":"\u6e05, \u626c","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/32a4239de8ff29adace466261d309424a1e5fe9f7e3036bf89fe03f2e3dbe717?s=96&d=mm&r=g","caption":"\u6e05, \u626c"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%a4%87%e5%bf%98%e5%8d%95\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37642","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/9"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37642"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37642\/revisions"}],"predecessor-version":[{"id":87319,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37642\/revisions\/87319"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37642"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37642"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37642"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}