{"id":274,"date":"2023-11-24T15:35:00","date_gmt":"2023-11-24T07:35:00","guid":{"rendered":"https:\/\/solost.cn\/?p=274"},"modified":"2023-11-25T02:06:41","modified_gmt":"2023-11-24T18:06:41","slug":"405","status":"publish","type":"post","link":"https:\/\/solost.cn\/?p=274","title":{"rendered":"Git\u57fa\u672c\u64cd\u4f5c"},"content":{"rendered":"

\u521d\u59cb\u5316\u8bbe\u7f6e<\/h2>\n

\u914d\u7f6e\u7528\u6237\u540d<\/h3>\n
git config --global user.name "Your Name"<\/code><\/pre>\n
\u914d\u7f6e\u90ae\u7bb1<\/h3>\n
git config --global user.email "mail@example.com"<\/code><\/pre>\n
\u5b58\u50a8\u914d\u7f6e<\/h3>\n
git config --global credential store<\/code><\/pre>\n
\u65b0\u5efa\u4ed3\u5e93<\/h2>\n
\u521b\u5efa\u2f00\u4e2a\u65b0\u7684\u672c\u5730\u4ed3\u5e93\uff08\u7701\u7565project-name \u5219\u5728\u5f53\u524d\u76ee\u5f55\u521b\u5efa\uff09<\/h3>\n
git init <project-name><\/code><\/pre>\n
\u514b\u9686\u2f00\u4e2a\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n
git clone <url><\/code><\/pre>\n
\u5de5\u4f5c\u533a\u57df<\/h2>\n
\u5de5\u4f5c\u533a\uff08Working Directory\uff09<\/h3>\n
\u5c31\u662f\u4f60\u5728\u7535\u8111\u2fa5\u80fd\u5b9e\u9645\u770b\u5230\u7684\u2f6c\u5f55<\/p>\n
\u6682\u5b58\u533a\uff08Stage\/Index\uff09<\/h3>\n
\u6682\u5b58\u533a\u4e5f\u53eb\u7d22\u5f15\uff0c\u2f64\u6765\u4e34\u65f6\u5b58\u653e\u672a\u63d0\u4ea4\u7684\u5185\u5bb9\uff0c\u2f00\u822c\u5728.git \u2f6c\u5f55\u4e0b\u7684index \u4e2d\u3002<\/p>\n
\u672c\u5730\u4ed3\u5e93\uff08Repository\uff09<\/h3>\n
Git \u5728\u672c\u5730\u7684\u7248\u672c\u5e93\uff0c \u4ed3\u5e93\u4fe1\u606f\u5b58\u50a8\u5728.git \u8fd9\u4e2a\u9690\u85cf\u2f6c\u5f55\u4e2d\u3002<\/p>\n
\u8fdc\u7a0b\u4ed3\u5e93\uff08Remote Repository\uff09<\/h3>\n
\u6258\u7ba1\u5728\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\u7684\u4ed3\u5e93\u3002 \u5e38\u2f64\u7684\u6709GitHub\uff0c GitLab\uff0c Gitee\u3002<\/p>\n
\u6587\u4ef6\u72b6\u6001<\/h2>\n
\u5df2\u4fee\u6539\uff08Modified\uff09<\/h3>\n
\u4fee\u6539\u4e86\u4f46\u662f\u6ca1\u6709\u4fdd\u5b58\u5230\u6682\u5b58\u533a\u7684\u2f42\u4ef6<\/p>\n
\u5df2\u6682\u5b58\uff08Staged\uff09<\/h3>\n
\u4fee\u6539\u540e\u5df2\u7ecf\u4fdd\u5b58\u5230\u6682\u5b58\u533a\u7684\u2f42\u4ef6<\/p>\n
\u5df2\u63d0\u4ea4\uff08Committed\uff09<\/h3>\n
\u628a\u6682\u5b58\u533a\u7684\u2f42\u4ef6\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u540e\u7684\u72b6\u6001<\/p>\n
\u6587\u4ef6\u540d\u79f0<\/h2>\n
main\/master \u9ed8\u8ba4\u4e3b\u5206\u652f\nOrigin \u9ed8\u8ba4\u8fdc\u7a0b\u4ed3\u5e93\nHEAD \u6307\u5411\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\nHEADA \u4e0a\u4e00\u4e2a\u7248\u672c\nHEAD~ \u4e0a\u56db\u4e2a\u7248\u672c<\/code><\/pre>\n
\u6dfb\u52a0\u548c\u63d0\u4ea4\u6587\u4ef6<\/h2>\n
git add <file<\/code><\/pre>\n
\u6dfb\u52a0\u2f00\u4e2a\u2f42\u4ef6\u5230\u6682\u5b58\u533a\uff0c\u2f50\u5982git add . \u5c31\u8868\u793a\u6dfb\u52a0\u6240\u6709\u2f42\u4ef6\u5230\u6682\u5b58\u533a\u3002<\/p>\n
git commit -m "message"<\/code><\/pre>\n
\u63d0\u4ea4\u6240\u6709\u6682\u5b58\u533a\u7684\u2f42\u4ef6\u5230\u672c\u5730\u4ed3\u5e93<\/p>\n
git commit -am "message"<\/code><\/pre>\n
\u63d0\u4ea4\u6240\u6709\u5df2\u4fee\u6539\u7684\u2f42\u4ef6\u5230\u672c\u5730\u4ed3\u5e93<\/p>\n
\u5220\u9664 \u64a4\u9500 \u6062\u590d<\/h2>\n
git mv <file><new-file><\/code><\/pre>\n
\u79fb\u52a8\u4e00\u4e2a\u6587\u4ef6\u5230\u65b0\u7684\u4f4d\u7f6e\u3002<\/p>\n
git rm <file><\/code><\/pre>\n
\u4ece\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u5220\u9664\u4e00\u4e2a\u6587\u4ef6\uff0c\u5e76\u4e14\u5c06\u8fd9\u6b21\u5220\u9664\u653e\u5165\u6682\u5b58\u533a\u3002<\/p>\n
git rm --cached <file><\/code><\/pre>\n
\u4ece\u7d22\u5f15\/\u6682\u5b58\u533a\u4e2d\u5220\u9664\u6587\u4ef6\uff0c\u4f46\u662f\u672c\u5730\u5de5\u4f5c\u533a\u6587\u4ef6\u8fd8\u5728\uff0c\u53ea\u662f\u4e0d\u5e0c\u671b\u8fd9\u4e2a\u6587\u4ef6\u88ab\u7248\u672c\u63a7\u5236\u3002<\/p>\n
git checkout <file> <commit-id><\/code><\/pre>\n
\u6062\u590d\u4e00\u4e2a\u6587\u4ef6\u5230\u4e4b\u524d\u7684\u7248\u672c\u3002<\/p>\n
git revert <commit-id><\/code><\/pre>\n
\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u7528\u6765\u64a4\u9500\u6307\u5b9a\u7684\u63d0\u4ea4\uff0c\u540e\u8005\u7684\u6240\u6709\u53d8\u5316\u5c06\u88ab\u524d\u8005\u62b5\u6d88\uff0c\u5e76\u4e14\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u3002<\/p>\n
git reset --mixed <commit-id><\/code><\/pre>\n
\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684HEAD\u4e3a\u4e4b\u524d\u7684\u67d0\u4e2a\u63d0\u4ea4\uff0c\u5e76\u4e14\u5220\u9664\u6240\u6709\u4e4b\u540e\u7684\u63d0\u4ea4\u3002<\/p>\n
hard\u53c2\u6570\u8868\u793a\u91cd\u7f6e\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\uff0c\nsoft\u53c2\u6570\u8868\u793a\u91cd\u7f6e\u6682\u5b58\u533a\uff0c\nmixed\u53c2\u6570\u8868\u793a\u91cd\u7f6e\u5de5\u4f5c\u533a\u3002<\/code><\/pre>\n
git restore --staged <file><\/code><\/pre>\n
\u64a4\u9500\u6682\u5b58\u533a\u7684\u6587\u4ef6\uff0c\u91cd\u65b0\u653e\u56de\u5de5\u4f5c\u533a(git add\u7684\u53cd\u5411\u64cd\u4f5c)\u3002<\/p>\n
git diff\u67e5\u770b\u5dee\u5f02<\/h2>\n
git status [-s]<\/code><\/pre>\n
\u67e5\u770b\u4ed3\u5e93\u72b6\u6001\uff0c\u5217\u51fa\u8fd8\u672a\u63d0\u4ea4\u7684\u65b0\u7684\u6216\u4fee\u6539\u7684\u6587\u4ef6\u3002$-s$\u662f\u67e5\u770b\u7b80\u7565\u6a21\u5f0f<\/p>\n
git log --oneline<\/code><\/pre>\n
\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c--oneline<\/code>\u8868\u793a\u7b80\u4ecb\u6a21\u5f0f\u3002<\/p>\n
git diff<\/code><\/pre>\n
\u67e5\u770b\u672a\u6682\u5b58\u7684\u6587\u4ef6\u66f4\u65b0\u4e86\u54ea\u4e9b\u90e8\u5206\u3002<\/p>\n
git diff <commit-id> <commit-id><\/code><\/pre>\n
\u67e5\u770b\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n
git diff HEAD<\/code><\/pre>\n
\u6bd4\u8f83\u5de5\u4f5c\u533a\u4e0e\u6682\u5b58\u533a\u4e4b\u95f4\u7684\u5173\u7cfb<\/p>\n
git diff cached<\/code><\/pre>\n
\u6bd4\u8f83\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93\u4e4b\u95f4\u7684\u5173\u7cfb<\/p>\n
git diff HEAD~ HEAD<\/code><\/pre>\n
\u6bd4\u8f83\u5f53\u524d\u7248\u672c\u548c\u4e0a\u4e2a\u7248\u672c<\/p>\n
git diff HEAD~x HEAD fil1<\/code><\/pre>\n
\u53ef\u4ee5\u7528\u6765\u6bd4\u8f83\u524dx\u4e2a\u7248\u672c\u548c\u73b0\u7248\u672c\u7684\u533a\u522b\uff0c\u540e\u9762\u6dfb\u52a0\u6587\u4ef6\u540d\u53ea\u4f1a\u67e5\u770b\u8be5\u6587\u4ef6\u7684\u533a\u522b<\/p>\n
.gitignore\u5ffd\u7565\u6587\u4ef6<\/h2>\n
\u9700\u8981\u5728git\u8fc7\u7a0b\u4e2d\u5ffd\u7565\u6389\u4e00\u4e9b\u6587\u4ef6<\/p>\n
.git Git\u4ed3\u5e93\u7684\u5143\u6570\u636e\u548c\u5bf9\u8c61\u6570\u636e\u5e93\n.gitignore \u5ffd\u7565\u6587\u4ef6\uff0c\u4e0d\u9700\u8981\u63d0\u4ea4\u5230\u4ed3\u5e93\u7684\u6587\u4ef6\n.gitattributes \u6307\u5411\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\n.gitkeep \u4f7f\u7a7a\u76ee\u5f55\u88ab\u63d0\u4ea4\u5230\u4ed3\u5e93\n.gitmodules \u8bb0\u5f55\u5b50\u6a21\u5757\u7684\u4fe1\u606f\n.gitconfig \u8bb0\u5f55\u4ed3\u5e93\u7684\u914d\u7f6e\u4fe1\u606f<\/code><\/pre>\n
.gitignore\n*.log \/\/\u5ffd\u7565\u67d0\u79cd\u6587\u4ef6\ntemp\/  \/\/\u5ffd\u7565\u6587\u4ef6\u5939\uff0c\u540e\u9762\u662f\u4ee5\/\u7ed3\u5c3e\u7684<\/code><\/pre>\n
\u5c31\u8d77\u5230\u4e86\u5ffd\u7565\u6240\u6709log\u7ed3\u5c3e\u7684\u6587\u4ef6\uff0c\u5982\u679c\u5df2\u7ecf\u88ab\u63d0\u4ea4\u5230\u4e86\u7248\u672c\u5e93\u4e2d\u5ffd\u7565\u662f\u6ca1\u6709\u4f5c\u7528\u7684\uff0c\u9700\u8981\u4ece\u6682\u5b58\u533a\u5220\u9664\uff0c\u9700\u8981\u4ec5\u4ec5\u5c06\u8fdc\u7a0b\u5e93\u4e2d\u5220\u9664\u5219\u4f7f\u7528git rm xxx --cached<\/code><\/p>\n
\u5982\u679c\u4e00\u4e2a\u6587\u4ef6\u5939\u4e0b\u65e0\u6587\u4ef6\u4e0d\u4f1a\u88ab\u6dfb\u52a0\u81f3\u4ed3\u5e93<\/p><\/blockquote>\n
gitignore\u6587\u4ef6\u7684\u5339\u914d\u89c4\u5219<\/h3>\n