{"id":1064,"date":"2024-07-03T14:32:41","date_gmt":"2024-07-03T06:32:41","guid":{"rendered":"http:\/\/zkeeer.space\/?p=1064"},"modified":"2024-07-03T14:32:41","modified_gmt":"2024-07-03T06:32:41","slug":"git-%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"http:\/\/zkeeer.space\/?p=1064","title":{"rendered":"git \u64cd\u4f5c"},"content":{"rendered":"

\u8865\u5145\u8d44\u6599\u770b\u8fd9\u91cc\uff01\uff01\uff01<\/span>https:\/\/git-scm.com\/book\/zh\/v2<\/a><\/p>\n

<\/p>\n

\u00a0 \u00a0Workspace<\/span>\uff1a \u5de5\u4f5c\u533a\uff0c\u5c31\u662f\u4f60\u5e73\u65f6\u5b58\u653e\u548c\u4fee\u6539\u9879\u76ee\u4ee3\u7801\u7684\u5730\u65b9<\/p>\n

Index \/ Stage<\/span>\uff1a \u6682\u5b58\u533a\uff0c\u7528\u4e8e\u4e34\u65f6\u5b58\u653e\u4f60\u7684\u6539\u52a8\uff0c\u4e8b\u5b9e\u4e0a\u5b83\u53ea\u662f\u4e00\u4e2a\u6587\u4ef6\uff0c\u4fdd\u5b58\u5373\u5c06\u63d0\u4ea4\u5230\u6587\u4ef6\u5217\u8868\u4fe1\u606f<\/p>\n

Repository<\/span>\uff1a \u4ed3\u5e93\u533a\uff08\u6216\u7248\u672c\u5e93\uff09\uff0c\u5c31\u662f\u5b89\u5168\u5b58\u653e\u6570\u636e\u7684\u4f4d\u7f6e\uff0c\u8fd9\u91cc\u9762\u6709\u4f60\u63d0\u4ea4\u5230\u6240\u6709\u7248\u672c\u7684\u6570\u636e\u3002\u5176\u4e2dHEAD\u6307\u5411\u6700\u65b0\u653e\u5165\u4ed3\u5e93\u7684\u7248\u672c<\/p>\n

Remote<\/span>\uff1a \u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6258\u7ba1\u4ee3\u7801\u7684\u670d\u52a1\u5668\uff0c\u53ef\u4ee5\u7b80\u5355\u7684\u8ba4\u4e3a\u662f\u4f60\u9879\u76ee\u7ec4\u4e2d\u7684\u4e00\u53f0\u7535\u8111\u7528\u4e8e\u8fdc\u7a0b\u6570\u636e\u4ea4\u6362<\/p>\n

\u00a0 \u00a02\u3001\u5de5\u4f5c\u6d41\u7a0b<\/span><\/h4>\n

git\u7684\u5de5\u4f5c\u6d41\u7a0b\u4e00\u822c\u662f\u8fd9\u6837\u7684\uff1a<\/p>\n

\uff11\u3001\u5728\u5de5\u4f5c\u76ee\u5f55\u4e2d\u6dfb\u52a0\u3001\u4fee\u6539\u6587\u4ef6\uff1b<\/p>\n

\uff12\u3001\u5c06\u9700\u8981\u8fdb\u884c\u7248\u672c\u7ba1\u7406\u7684\u6587\u4ef6\u653e\u5165\u6682\u5b58\u533a\u57df\uff1b<\/p>\n

\uff13\u3001\u5c06\u6682\u5b58\u533a\u57df\u7684\u6587\u4ef6\u63d0\u4ea4\u5230git\u4ed3\u5e93\u3002<\/p>\n

\u56e0\u6b64\uff0cgit\u7ba1\u7406\u7684\u6587\u4ef6\u6709\u4e09\u79cd\u72b6\u6001\uff1a\u5df2\u4fee\u6539\uff08modified\uff09,\u5df2\u6682\u5b58\uff08staged\uff09,\u5df2\u63d0\u4ea4(committed)<\/p>\n

\u00a0 \u00a03\u3001\u6587\u4ef6\u7684\u56db\u79cd\u72b6\u6001<\/span><\/h4>\n

\u7248\u672c\u63a7\u5236\u5c31\u662f\u5bf9\u6587\u4ef6\u7684\u7248\u672c\u63a7\u5236\uff0c\u8981\u5bf9\u6587\u4ef6\u8fdb\u884c\u4fee\u6539\u3001\u63d0\u4ea4\u7b49\u64cd\u4f5c\uff0c\u9996\u5148\u8981\u77e5\u9053\u6587\u4ef6\u5f53\u524d\u5728\u4ec0\u4e48\u72b6\u6001\uff0c\u4e0d\u7136\u53ef\u80fd\u4f1a\u63d0\u4ea4\u4e86\u73b0\u5728\u8fd8\u4e0d\u60f3\u63d0\u4ea4\u7684\u6587\u4ef6\uff0c\u6216\u8005\u8981\u63d0\u4ea4\u7684\u6587\u4ef6\u6ca1\u63d0\u4ea4\u4e0a\u3002<\/p>\n

GIT\u4e0d\u5173\u5fc3\u6587\u4ef6\u4e24\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u5177\u4f53\u5dee\u522b\uff0c\u800c\u662f\u5173\u5fc3\u6587\u4ef6\u7684\u6574\u4f53\u662f\u5426\u6709\u6539\u53d8\uff0c\u82e5\u6587\u4ef6\u88ab\u6539\u53d8\uff0c\u5728\u6dfb\u52a0\u63d0\u4ea4\u65f6\u5c31\u751f\u6210\u6587\u4ef6\u65b0\u7248\u672c\u7684\u5feb\u7167\uff0c\u800c\u5224\u65ad\u6587\u4ef6\u6574\u4f53\u662f\u5426\u6539\u53d8\u7684\u65b9\u6cd5\u5c31\u662f\u7528<\/p>\n

SHA-1\u7b97\u6cd5\u8ba1\u7b97\u6587\u4ef6\u7684\u6821\u9a8c\u548c\u3002<\/p>\n

<\/p>\n

Untracked:<\/span>\u00a0 \u00a0\u672a\u8ddf\u8e2a, \u6b64\u6587\u4ef6\u5728\u6587\u4ef6\u5939\u4e2d, \u4f46\u5e76\u6ca1\u6709\u52a0\u5165\u5230git\u5e93, \u4e0d\u53c2\u4e0e\u7248\u672c\u63a7\u5236. \u901a\u8fc7git add \u72b6\u6001\u53d8\u4e3aStaged.<\/p>\n

\u00a0Unmodify:<\/span>\u00a0 \u00a0\u6587\u4ef6\u5df2\u7ecf\u5165\u5e93, \u672a\u4fee\u6539, \u5373\u7248\u672c\u5e93\u4e2d\u7684\u6587\u4ef6\u5feb\u7167\u5185\u5bb9\u4e0e\u6587\u4ef6\u5939\u4e2d\u5b8c\u5168\u4e00\u81f4. \u8fd9\u79cd\u7c7b\u578b\u7684\u6587\u4ef6\u6709\u4e24\u79cd\u53bb\u5904, \u5982\u679c\u5b83\u88ab\u4fee\u6539, \u800c\u53d8\u4e3aModified.<\/p>\n

\u5982\u679c\u4f7f\u7528git rm\u79fb\u51fa\u7248\u672c\u5e93, \u5219\u6210\u4e3aUntracked\u6587\u4ef6<\/p>\n

Modified:<\/span> \u6587\u4ef6\u5df2\u4fee\u6539, \u4ec5\u4ec5\u662f\u4fee\u6539, \u5e76\u6ca1\u6709\u8fdb\u884c\u5176\u4ed6\u7684\u64cd\u4f5c. \u8fd9\u4e2a\u6587\u4ef6\u4e5f\u6709\u4e24\u4e2a\u53bb\u5904, \u901a\u8fc7git add\u53ef\u8fdb\u5165\u6682\u5b58staged\u72b6\u6001, \u4f7f\u7528git checkout \u5219\u4e22\u5f03\u4fee\u6539\u8fc7,<\/p>\n

\u8fd4\u56de\u5230unmodify\u72b6\u6001, \u8fd9\u4e2agit checkout\u5373\u4ece\u5e93\u4e2d\u53d6\u51fa\u6587\u4ef6, \u8986\u76d6\u5f53\u524d\u4fee\u6539<\/p>\n

Staged:<\/span> \u6682\u5b58\u72b6\u6001. \u6267\u884cgit commit\u5219\u5c06\u4fee\u6539\u540c\u6b65\u5230\u5e93\u4e2d, \u8fd9\u65f6\u5e93\u4e2d\u7684\u6587\u4ef6\u548c\u672c\u5730\u6587\u4ef6\u53c8\u53d8\u4e3a\u4e00\u81f4, \u6587\u4ef6\u4e3aUnmodify\u72b6\u6001. \u6267\u884cgit reset HEAD filename\u53d6\u6d88\u6682\u5b58,<\/p>\n

\u6587\u4ef6\u72b6\u6001\u4e3aModified<\/p>\n

\u4e0b\u9762\u7684\u56fe\u5f88\u597d\u7684\u89e3\u91ca\u4e86\u8fd9\u56db\u79cd\u72b6\u6001\u7684\u8f6c\u53d8\uff1a<\/p>\n

<\/p>\n

\u65b0\u5efa\u6587\u4ef6—>Untracked<\/p>\n

\u4f7f\u7528add\u547d\u4ee4\u5c06\u65b0\u5efa\u7684\u6587\u4ef6\u52a0\u5165\u5230\u6682\u5b58\u533a—>Staged<\/p>\n

\u4f7f\u7528commit\u547d\u4ee4\u5c06\u6682\u5b58\u533a\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93—>Unmodified<\/p>\n

\u5982\u679c\u5bf9Unmodified\u72b6\u6001\u7684\u6587\u4ef6\u8fdb\u884c\u4fee\u6539—> modified<\/p>\n

\u5982\u679c\u5bf9Unmodified\u72b6\u6001\u7684\u6587\u4ef6\u8fdb\u884cremove\u64cd\u4f5c—>Untracked<\/p>\n

 <\/p>\n

\u4e8c\u3001\u56db\u4e2a\u533a\u57df\u5e38\u7528\u547d\u4ee4<\/h2>\n

\u00a0 \u00a01\u3001\u65b0\u5efa\u4ee3\u7801\u5e93<\/span><\/h4>\n

# \u5728\u5f53\u524d\u76ee\u5f55\u65b0\u5efa\u4e00\u4e2aGit\u4ee3\u7801\u5e93 git init<\/p>\n

# \u65b0\u5efa\u4e00\u4e2a\u76ee\u5f55\uff0c\u5c06\u5176\u521d\u59cb\u5316\u4e3aGit\u4ee3\u7801\u5e93git init [project-name]<\/p>\n

# \u4e0b\u8f7d\u4e00\u4e2a\u9879\u76ee\u548c\u5b83\u7684\u6574\u4e2a\u4ee3\u7801\u5386\u53f2git clone [url]<\/p>\n

\u00a0 \u00a02\u3001\u67e5\u770b\u6587\u4ef6\u72b6\u6001<\/span><\/h4>\n

#\u67e5\u770b\u6307\u5b9a\u6587\u4ef6\u72b6\u6001git status [filename]<\/p>\n

#\u67e5\u770b\u6240\u6709\u6587\u4ef6\u72b6\u6001git status<\/p>\n

\u00a0 \u00a0 3\u3001\u5de5\u4f5c\u533a<–>\u6682\u5b58\u533a<\/span><\/h4>\n

# \u6dfb\u52a0\u6307\u5b9a\u6587\u4ef6\u5230\u6682\u5b58\u533agit add [file1] [file2] …<\/p>\n

# \u6dfb\u52a0\u6307\u5b9a\u76ee\u5f55\u5230\u6682\u5b58\u533a\uff0c\u5305\u62ec\u5b50\u76ee\u5f55git add [dir]<\/p>\n

# \u6dfb\u52a0\u5f53\u524d\u76ee\u5f55\u7684\u6240\u6709\u6587\u4ef6\u5230\u6682\u5b58\u533agit add .<\/p>\n

#\u5f53\u6211\u4eec\u9700\u8981\u5220\u9664\u6682\u5b58\u533a\u6216\u5206\u652f\u4e0a\u7684\u6587\u4ef6, \u540c\u65f6\u5de5\u4f5c\u533a\u4e5f\u4e0d\u9700\u8981\u8fd9\u4e2a\u6587\u4ef6\u4e86, \u53ef\u4ee5\u4f7f\u7528\uff08\u26a0\ufe0f\uff09git rm file_path<\/p>\n

#\u5f53\u6211\u4eec\u9700\u8981\u5220\u9664\u6682\u5b58\u533a\u6216\u5206\u652f\u4e0a\u7684\u6587\u4ef6, \u4f46\u672c\u5730\u53c8\u9700\u8981\u4f7f\u7528, \u8fd9\u4e2a\u65f6\u5019\u76f4\u63a5push\u90a3\u8fb9\u8fd9\u4e2a\u6587\u4ef6\u5c31\u6ca1\u6709\uff0c\u5982\u679cpush\u4e4b\u524d\u91cd\u65b0add\u90a3\u4e48\u8fd8\u662f\u4f1a\u6709\u3002git rm –cached file_path<\/p>\n

#\u76f4\u63a5\u52a0\u6587\u4ef6\u540d \u4ece\u6682\u5b58\u533a\u5c06\u6587\u4ef6\u6062\u590d\u5230\u5de5\u4f5c\u533a\uff0c\u5982\u679c\u5de5\u4f5c\u533a\u5df2\u7ecf\u6709\u8be5\u6587\u4ef6\uff0c\u5219\u4f1a\u9009\u62e9\u8986\u76d6<\/p>\n

#\u52a0\u4e86\u3010\u5206\u652f\u540d\u3011 +\u6587\u4ef6\u540d \u5219\u8868\u793a\u4ece\u5206\u652f\u540d\u4e3a\u6240\u5199\u7684\u5206\u652f\u540d\u4e2d\u62c9\u53d6\u6587\u4ef6 \u5e76\u8986\u76d6\u5de5\u4f5c\u533a\u91cc\u7684\u6587\u4ef6git checkout<\/p>\n

\u00a0 \u00a0 4\u3001\u5de5\u4f5c\u533a<–>\u8d44\u6e90\u5e93\uff08\u7248\u672c\u5e93\uff09<\/span><\/h4>\n

#\u5c06\u6682\u5b58\u533a–>\u8d44\u6e90\u5e93\uff08\u7248\u672c\u5e93\uff09git commit -m ‘\u8be5\u6b21\u63d0\u4ea4\u8bf4\u660e’#\u5982\u679c\u51fa\u73b0:\u5c06\u4e0d\u5fc5\u8981\u7684\u6587\u4ef6commit \u6216\u8005 \u4e0a\u6b21\u63d0\u4ea4\u89c9\u5f97\u662f\u9519\u7684 \u6216\u8005 \u4e0d\u60f3\u6539\u53d8\u6682\u5b58\u533a\u5185\u5bb9\uff0c\u53ea\u662f\u60f3\u8c03\u6574\u63d0\u4ea4\u7684\u4fe1\u606f#\u79fb\u9664\u4e0d\u5fc5\u8981\u7684\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u6587\u4ef6git reset HEAD \u6587\u4ef6\u540d<\/p>\n

#\u53bb\u6389\u4e0a\u4e00\u6b21\u7684\u63d0\u4ea4\uff08\u4f1a\u76f4\u63a5\u53d8\u6210add\u4e4b\u524d\u72b6\u6001\uff09 git reset HEAD^<\/p>\n

#\u53bb\u6389\u4e0a\u4e00\u6b21\u7684\u63d0\u4ea4\uff08\u53d8\u6210add\u4e4b\u540e\uff0ccommit\u4e4b\u524d\u72b6\u6001\uff09 git reset –soft HEAD^<\/p>\n

\u00a0 \u00a0 5\u3001\u8fdc\u7a0b\u64cd\u4f5c<\/span><\/h4>\n

# \u53d6\u56de\u8fdc\u7a0b\u4ed3\u5e93\u7684\u53d8\u5316\uff0c\u5e76\u4e0e\u672c\u5730\u5206\u652f\u5408\u5e76git pull<\/p>\n

# \u4e0a\u4f20\u672c\u5730\u6307\u5b9a\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93git push<\/p>\n

\u00a0 \u00a06\u3001\u5176\u5b83\u5e38\u7528\u547d\u4ee4<\/span><\/h4>\n

# \u663e\u793a\u5f53\u524d\u7684Git\u914d\u7f6egit config –list<\/p>\n

# \u7f16\u8f91Git\u914d\u7f6e\u6587\u4ef6git config -e [–global]<\/p>\n

#\u521d\u6b21commit\u4e4b\u524d\uff0c\u9700\u8981\u914d\u7f6e\u7528\u6237\u90ae\u7bb1\u53ca\u7528\u6237\u540d\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1agit config –global user.email “you@example.com<\/a>”<\/p>\n

git config –global user.name “Your Name”#\u8c03\u51faGit\u7684\u5e2e\u52a9\u6587\u6863git –help<\/p>\n

#\u67e5\u770b\u67d0\u4e2a\u5177\u4f53\u547d\u4ee4\u7684\u5e2e\u52a9\u6587\u6863git +\u547d\u4ee4 –help<\/p>\n

#\u67e5\u770bgit\u7684\u7248\u672cgit –version<\/p>\n

\u5e38\u89c1\u95ee\u9898<\/p>\n

\u672c\u5730\u4ed3\u5e93\u8ddfgithub\u65b0\u5efa\u4ed3\u5e93\u8fdb\u884c\u5173\u8054<\/p>\n

\u4f7f\u7528git remote add github git@github.com:ZKeeer\/Psyncd.git \u6dfb\u52a0\u8fdc\u7aef\u4ed3\u5e93<\/p>\n

\u7136\u540e\u662fpull\u548crebase\uff0cgit pull github master –rebase \u8981\u5236\u5b9a\u672c\u5730\u8fdb\u884c\u5408\u5e76\u7684\u5206\u652f\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"

\u8865\u5145\u8d44\u6599\u770b\u8fd9\u91cc\uff01\uff01\uff01https:\/\/git-scm.com\/book\/zh\/v2<\/p>\n","protected":false},"author":1,"featured_media":1061,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[106],"_links":{"self":[{"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/posts\/1064"}],"collection":[{"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/zkeeer.space\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1064"}],"version-history":[{"count":1,"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/posts\/1064\/revisions"}],"predecessor-version":[{"id":1094,"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/posts\/1064\/revisions\/1094"}],"wp:featuredmedia":[{"embeddable":true,"href":"http:\/\/zkeeer.space\/index.php?rest_route=\/wp\/v2\/media\/1061"}],"wp:attachment":[{"href":"http:\/\/zkeeer.space\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1064"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/zkeeer.space\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1064"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/zkeeer.space\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1064"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}