{"id":37,"date":"2019-05-13T13:53:36","date_gmt":"2019-05-13T05:53:36","guid":{"rendered":"https:\/\/thereisno.top:4430\/?p=37"},"modified":"2019-05-13T13:53:36","modified_gmt":"2019-05-13T05:53:36","slug":"%e5%b8%b8%e7%94%a8-git-%e5%91%bd%e4%bb%a4%e6%b8%85%e5%8d%95","status":"publish","type":"post","link":"https:\/\/thereisno.top\/?p=37","title":{"rendered":"\u5e38\u7528 Git \u547d\u4ee4\u6e05\u5355"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">\u4e00\u3001\u65b0\u5efa\u4ee3\u7801\u5e93<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u5728\u5f53\u524d\u76ee\u5f55\u65b0\u5efa\u4e00\u4e2aGit\u4ee3\u7801\u5e93<br>\n$ git\ninit<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u76ee\u5f55\uff0c\u5c06\u5176\u521d\u59cb\u5316\u4e3aGit\u4ee3\u7801\u5e93<br>\n$ git init [project-name]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u4e0b\u8f7d\u4e00\u4e2a\u9879\u76ee\u548c\u5b83\u7684\u6574\u4e2a\u4ee3\u7801\u5386\u53f2<br>\n$ git clone [url]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u4ec5\u514b\u9686\u5206\u652f\nb1<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git clone -b b1 [url]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e8c\u3001\u914d\u7f6e<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u7684\u8bbe\u7f6e\u6587\u4ef6\u4e3a.gitconfig\uff0c\u5b83\u53ef\u4ee5\u5728\u7528\u6237\u4e3b\u76ee\u5f55\u4e0b\uff08\u5168\u5c40\u914d\u7f6e\uff09\uff0c\u4e5f\u53ef\u4ee5\u5728\u9879\u76ee\u76ee\u5f55\u4e0b\uff08\u9879\u76ee\u914d\u7f6e\uff09\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u663e\u793a\u5f53\u524d\u7684Git\u914d\u7f6e<br>\n$ git\nconfig &#8211;list<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u7f16\u8f91Git\u914d\u7f6e\u6587\u4ef6<br>\n$ git config -e [&#8211;global]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u8bbe\u7f6e\u63d0\u4ea4\u4ee3\u7801\u65f6\u7684\u7528\u6237\u4fe1\u606f<br>\n$ git config [&#8211;global] user.name &#8220;[name]&#8221;<br>\n$ git config [&#8211;global] user.email &#8220;[email\naddress]&#8221;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#\u63d0\u4ea4\u68c0\u51fa\u5747\u4e0d\u8f6c\u6362<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git config &#8211;global core.autocrlf\nfalse<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e09\u3001\u589e\u52a0\/\u5220\u9664\u6587\u4ef6<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u6dfb\u52a0\u6307\u5b9a\u6587\u4ef6\u5230\u6682\u5b58\u533a<br>\n$ git\nadd [file1] [file2] &#8230;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6dfb\u52a0\u6307\u5b9a\u76ee\u5f55\u5230\u6682\u5b58\u533a\uff0c\u5305\u62ec\u5b50\u76ee\u5f55<br>\n$ git add [dir]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6dfb\u52a0\u5f53\u524d\u76ee\u5f55\u7684\u6240\u6709\u6587\u4ef6\u5230\u6682\u5b58\u533a<br>\n$ git add .<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6dfb\u52a0\u6bcf\u4e2a\u53d8\u5316\u524d\uff0c\u90fd\u4f1a\u8981\u6c42\u786e\u8ba4<br>\n# \u5bf9\u4e8e\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u591a\u5904\u53d8\u5316\uff0c\u53ef\u4ee5\u5b9e\u73b0\u5206\u6b21\u63d0\u4ea4<br>\n$ git add -p<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5220\u9664\u5de5\u4f5c\u533a\u6587\u4ef6\uff0c\u5e76\u4e14\u5c06\u8fd9\u6b21\u5220\u9664\u653e\u5165\u6682\u5b58\u533a<br>\n$ git rm [file1] [file2] &#8230;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u505c\u6b62\u8ffd\u8e2a\u6307\u5b9a\u6587\u4ef6\uff0c\u4f46\u8be5\u6587\u4ef6\u4f1a\u4fdd\u7559\u5728\u5de5\u4f5c\u533a<br>\n$ git rm &#8211;cached [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6539\u540d\u6587\u4ef6\uff0c\u5e76\u4e14\u5c06\u8fd9\u4e2a\u6539\u540d\u653e\u5165\u6682\u5b58\u533a<br>\n$ git mv [file-original] [file-renamed]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u56db\u3001\u4ee3\u7801\u63d0\u4ea4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u63d0\u4ea4\u6682\u5b58\u533a\u5230\u4ed3\u5e93\u533a<br>\n$ git\ncommit -m [message]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63d0\u4ea4\u6682\u5b58\u533a\u7684\u6307\u5b9a\u6587\u4ef6\u5230\u4ed3\u5e93\u533a<br>\n$ git commit [file1] [file2] &#8230; -m [message]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63d0\u4ea4\u5de5\u4f5c\u533a\u81ea\u4e0a\u6b21commit\u4e4b\u540e\u7684\u53d8\u5316\uff0c\u76f4\u63a5\u5230\u4ed3\u5e93\u533a<br>\n$ git commit -a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63d0\u4ea4\u65f6\u663e\u793a\u6240\u6709diff\u4fe1\u606f<br>\n$ git commit -v<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u4f7f\u7528\u4e00\u6b21\u65b0\u7684commit\uff0c\u66ff\u4ee3\u4e0a\u4e00\u6b21\u63d0\u4ea4<br>\n# \u5982\u679c\u4ee3\u7801\u6ca1\u6709\u4efb\u4f55\u65b0\u53d8\u5316\uff0c\u5219\u7528\u6765\u6539\u5199\u4e0a\u4e00\u6b21commit\u7684\u63d0\u4ea4\u4fe1\u606f<br>\n$ git commit &#8211;amend -m [message]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u505a\u4e0a\u4e00\u6b21commit\uff0c\u5e76\u5305\u62ec\u6307\u5b9a\u6587\u4ef6\u7684\u65b0\u53d8\u5316<br>\n$ git commit &#8211;amend [file1] [file2] &#8230;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e94\u3001\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u5217\u51fa\u6240\u6709\u672c\u5730\u5206\u652f<br>\n$ git branch<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5217\u51fa\u6240\u6709\u8fdc\u7a0b\u5206\u652f<br>\n$ git branch -r<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5217\u51fa\u6240\u6709\u672c\u5730\u5206\u652f\u548c\u8fdc\u7a0b\u5206\u652f<br>\n$ git branch -a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u4f46\u4f9d\u7136\u505c\u7559\u5728\u5f53\u524d\u5206\u652f<br>\n$ git branch [branch-name]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f<br>\n$ git checkout -b [branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ \u62c9\u53d6\u8fdc\u7a0b\u5206\u652f\u5e76\u521b\u5efa\u672c\u5730\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git checkout -b \u672c\u5730\u5206\u652f\u540dx&nbsp; origin\/\u8fdc\u7a0b\u5206\u652f\u540dx<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git fetch origin&nbsp; \u8fdc\u7a0b\u5206\u652f\u540dx:\u672c\u5730\u5206\u652f\u540dx<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u6307\u5411\u6307\u5b9acommit<br>\n$ git branch [branch] [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u4e0e\u6307\u5b9a\u7684\u8fdc\u7a0b\u5206\u652f\u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb<br>\n$ git branch &#8211;track [branch] [remote-branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff0c\u6307\u5411\u67d0\u4e2atag<br>\n$ git checkout -b [branch] [tag]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5207\u6362\u5230\u6307\u5b9a\u5206\u652f\uff0c\u5e76\u66f4\u65b0\u5de5\u4f5c\u533a<br>\n$ git checkout [branch-name]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5207\u6362\u5230\u4e0a\u4e00\u4e2a\u5206\u652f<br>\n$ git checkout &#8211;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5efa\u7acb\u8ffd\u8e2a\u5173\u7cfb\uff0c\u5728\u73b0\u6709\u5206\u652f\u4e0e\u6307\u5b9a\u7684\u8fdc\u7a0b\u5206\u652f\u4e4b\u95f4<br>\n$ git branch &#8211;set-upstream [branch] [remote-branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5408\u5e76\u6307\u5b9a\u5206\u652f\u5230\u5f53\u524d\u5206\u652f<br>\n$ git merge [branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u9009\u62e9\u4e00\u4e2acommit\uff0c\u5408\u5e76\u8fdb\u5f53\u524d\u5206\u652f<br>\n$ git cherry-pick [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5220\u9664\u5206\u652f<br>\n$ git branch -d [branch-name]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5220\u9664\u8fdc\u7a0b\u5206\u652f<br>\n$ git push origin &#8211;delete [branch-name]<br>\n$ git branch -dr [remote\/branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u4ece\u672c\u5730master\u62c9\u53d6\u4ee3\u7801\u66f4\u65b0\u5f53\u524d\u5206\u652f\uff1abranch \u4e00\u822c\u4e3amaster<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>$ git rebase [branch]<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">MERGE_HEAD\u6307\u9488\u88ab\u7f6e\u4e8e\u5176\u4ed6\u5206\u652f\u7684\u9876\u90e8<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u516d\u3001\u6807\u7b7e<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">tag\u5c31\u662f\u4e00\u4e2a\u53ea\u8bfb\u7684branch\uff0c\u4e00\u822c\u4e3a\u6bcf\u4e00\u4e2a\u53ef\u53d1\u5e03\u7684\u91cc\u7a0b\u7891\u7248\u672c\u6253\u4e00\u4e2atag\uff0ccommit\u7684\u4ee3\u7801\u62c9\u51fa\u6765\u4f5c\u4e3atag\u3002\u5f00\u53d1\u4eba\u5458\u53ef\u4ee5\u7ee7\u7eed\u5728\u5f53\u524d\u5f00\u53d1\u5206\u652f\u4e0a\u5f00\u53d1\uff0c\u51c6\u5907\u4e0b\u4e00\u4e2asprint\u7684\u4e0a\u7ebf\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u679c\u7a81\u7136\u6709<strong>\u7d27\u6025\u4e0a\u7ebf<\/strong>\uff0c\u53ef\u4ee5\u5728\u6700\u65b0\u7248\u672c\u7684tag\u7684\u57fa\u7840\u4e0a\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git branch\n&lt;branch name&gt; &lt;tag name&gt;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7136\u540echeckout\u4e00\u4e0b\uff0c\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u7d27\u6025\u4e0a\u7ebf\u7684\u5f00\u53d1\u3002\u5f00\u53d1\u5b8c\u6210\uff0c\u4e0a\u7ebf\u540e\u5c06\u65b0\u7684\u4ee3\u7801<strong>merge<\/strong>\u5230\u5f00\u53d1\u5206\u652f\u4e0a\uff0c\u7ee7\u7eed\u5f00\u53d1\u3002\u8fd9\u6837\u505a\u7684\u597d\u5904\u662f\u5f00\u53d1\u4e00\u534a\u7684\u4ee3\u7801\u4e0d\u4f1a\u5f71\u54cd\u5230\u7d27\u6025\u4e0a\u7ebf\uff0c\u65b9\u4fbf\u6d4b\u8bd5\u4eba\u5458\u6d4b\u8bd5\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5217\u51fa\u6240\u6709tag<br>\n$ git\ntag<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2atag\u5728\u5f53\u524dcommit<br>\n$ git tag [tag]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63d0\u4ea4\u6307\u5b9atag<br>\n$ git push [remote] [tag]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;git tag pre_release_20181229<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;git push origin pre_release_20181229<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u65b0\u5efa\u4e00\u4e2atag\u5728\u6307\u5b9acommit<br>\n$ git tag [tag] [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63d0\u4ea4\u6240\u6709tag<br>\n$ git push [remote] &#8211;tags<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5220\u9664\u672c\u5730tag<br>\n$ git tag -d [tag]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5220\u9664\u8fdc\u7a0btag<br>\n$ git push origin :refs\/tags\/[tagName]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u67e5\u770btag\u4fe1\u606f<br>\n$ git show [tag]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e03\u3001\u67e5\u770b\u4fe1\u606f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u663e\u793a\u6709\u53d8\u66f4\u7684\u6587\u4ef6<br>\n$ git\nstatus<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u5f53\u524d\u5206\u652f\u7684\u7248\u672c\u5386\u53f2<br>\n$ git log<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793acommit\u5386\u53f2\uff0c\u4ee5\u53ca\u6bcf\u6b21commit\u53d1\u751f\u53d8\u66f4\u7684\u6587\u4ef6<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git log &#8211;graph -2&nbsp; \u6811\u5f62\u7ed3\u6784\u67e5\u770b\u65e5\u5fd7<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">commit\nd74ff46bd373467c0f38bcdac3dbca331f887d58 (<strong>HEAD -&gt; <\/strong><strong>master<\/strong>,\n<strong>origin\/master<\/strong>, <strong>origin\/HEAD<\/strong>)<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Author:\nYour Name &lt;you@example.com&gt;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Date: &nbsp; Mon Dec\n17 22:37:04 2018 +0800<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;\n&nbsp; master local<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">commit\n782563aa449ccd3c461955540864712091eea330 (<strong>origin\/dev<\/strong>, <strong>localdev<\/strong>)<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Author:\nYour Name &lt;you@example.com&gt;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">commit\nd74ff46bd373467c0f38bcdac3dbca331f887d58 (<strong>HEAD -&gt; <\/strong><strong>master<\/strong>,\n<strong>origin\/master<\/strong>,&nbsp;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>origin\/HEAD<\/strong>)<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u62ec\u53f7\u91cc\u9762\u6709\u989c\u8272\u7684\u6587\u5b57\u8868\u793a\u662f\u540c\u6837\u7248\u672c\u5185\u5bb9<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git log &#8211;stat<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u641c\u7d22\u63d0\u4ea4\u5386\u53f2\uff0c\u6839\u636e\u5173\u952e\u8bcd<br>\n$ git log -S [keyword]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u4e2acommit\u4e4b\u540e\u7684\u6240\u6709\u53d8\u52a8\uff0c\u6bcf\u4e2acommit\u5360\u636e\u4e00\u884c<br>\n$ git log [tag] HEAD &#8211;pretty=format:%s<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u4e2acommit\u4e4b\u540e\u7684\u6240\u6709\u53d8\u52a8\uff0c\u5176&#8221;\u63d0\u4ea4\u8bf4\u660e&#8221;\u5fc5\u987b\u7b26\u5408\u641c\u7d22\u6761\u4ef6<br>\n$ git log [tag] HEAD &#8211;grep\nfeature<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u4e2a\u6587\u4ef6\u7684\u7248\u672c\u5386\u53f2\uff0c\u5305\u62ec\u6587\u4ef6\u6539\u540d<br>\n$ git log &#8211;follow [file]<br>\n$ git whatchanged [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6307\u5b9a\u6587\u4ef6\u76f8\u5173\u7684\u6bcf\u4e00\u6b21diff<br>\n$ git log -p [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u8fc7\u53bb5\u6b21\u63d0\u4ea4<br>\n$ git log -5 &#8211;pretty &#8211;oneline<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6811\u72b6\u7ed3\u6784\u67e5\u770blog<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git log &#8211;graph<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6240\u6709\u63d0\u4ea4\u8fc7\u7684\u7528\u6237\uff0c\u6309\u63d0\u4ea4\u6b21\u6570\u6392\u5e8f<br>\n$ git shortlog -sn<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6307\u5b9a\u6587\u4ef6\u662f\u4ec0\u4e48\u4eba\u5728\u4ec0\u4e48\u65f6\u95f4\u4fee\u6539\u8fc7<br>\n$ git blame [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u5dee\u5f02<br>\n$ git diff<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6682\u5b58\u533a\u548c\u4e0a\u4e00\u4e2acommit\u7684\u5dee\u5f02<br>\n$ git diff &#8211;cached [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u5de5\u4f5c\u533a\u4e0e\u5f53\u524d\u5206\u652f\u6700\u65b0commit\u4e4b\u95f4\u7684\u5dee\u5f02<br>\n$ git diff HEAD<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6307\u5b9a\u6587\u4ef6\u5de5\u4f5c\u533a\u4e0e\u5f53\u524d\u5206\u652f\u6700\u65b0commit\u4e4b\u95f4\u7684\u5dee\u5f02<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;git diff HEAD &#8212; [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02<br>\n$ git diff [first-branch]&#8230;[second-branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u4eca\u5929\u4f60\u5199\u4e86\u591a\u5c11\u884c\u4ee3\u7801<br>\n$ git diff &#8211;shortstat &#8220;@{0\nday ago}&#8221;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u7684\u5143\u6570\u636e\u548c\u5185\u5bb9\u53d8\u5316<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git\ndiff branch1 branch2 &#8211;stat&nbsp; &nbsp;\/\/\u663e\u793a\u51fa\u6240\u6709\u6709\u5dee\u5f02\u7684\u6587\u4ef6\u5217\u8868<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git\ndiff branch1 branch2 \u5177\u4f53\u6587\u4ef6\u8def\u5f84&nbsp; &nbsp;\/\/\u663e\u793a\u6307\u5b9a\u6587\u4ef6\u7684\u8be6\u7ec6\u5dee\u5f02<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git\ndiff branch1 branch2&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n&nbsp; &nbsp;\/\/\u663e\u793a\u51fa\u6240\u6709\u6709\u5dee\u5f02\u7684\u6587\u4ef6\u7684\u8be6\u7ec6\u5dee\u5f02<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Origin0\u662f\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git\ndiff master origin0\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git\nfetch origin0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u83b7\u53d6\u53e6\u5916\u4e00\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u5185\u5bb9\uff0c\u662f\u4ed3\u5e93\u540d\u800c\u975e\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git merge origin0\/master #\u5982\u679c\u662forigin \u53ef\u7701\u7565origin0\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5408\u5e76\u6309\u7167\u6539\u52a8\u63d0\u4ea4\u8282\u70b9\uff08\u63d0\u4ea4\u6233\uff09\u4e3a\u662f\u5426\u51b2\u7a81\u4f9d\u636e\uff0c\u800c\u975e\u5185\u5bb9<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git show [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u53d1\u751f\u53d8\u5316\u7684\u6587\u4ef6<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#\u67e5\u770b\u67d0\u6b21\u63d0\u4ea4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git show [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git show <strong>356f6def9d3fb7f3b9032ff5aa4b9110d4cca87e<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git show &#8211;name-only [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u6b21\u63d0\u4ea4\u65f6\uff0c\u67d0\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9<br>\n$ git show [commit]:[filename]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u5f53\u524d\u5206\u652f\u7684\u6700\u8fd1\u51e0\u6b21\u63d0\u4ea4<br>\n$ git reflog<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u516b\u3001\u8fdc\u7a0b\u540c\u6b65<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><br>\n# \u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6240\u6709\u53d8\u52a8<br>\n$ git fetch [remote] \/\/fetch \u4e0d\u4f1a\u81ea\u52a8\u5408\u5e76\uff0c\u9700merge\uff0c\u6216\u8005\u76f4\u63a5pull <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git pull \u66f4\u65b9\u4fbf<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u6240\u6709\u8fdc\u7a0b\u4ed3\u5e93<br>\n$ git remote -v<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u663e\u793a\u67d0\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4fe1\u606f<br>\n$ git remote show [remote]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u589e\u52a0\u4e00\u4e2a\u65b0\u7684\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5e76\u547d\u540d<br>\n$ git remote add [shortname] [url]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u4f4d\u7f6e\uff0c\u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git remote -v<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">origin\u00a0 <a href=\"http:\/\/172.16.1.20:3000\/xuenhua\/CRMAOS7.git\">http:\/\/172.16.1.20:3000\/xuenhua\/XXXX.git<\/a> (fetch)<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">origin\u00a0 <a href=\"http:\/\/172.16.1.20:3000\/xuenhua\/CRMAOS7.git\">http:\/\/172.16.1.20:3000\/xuenhua\/XXXX.git<\/a> (push)<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93\u65b9\u6cd5\u6709\u4e09\u79cd\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">1.\u4fee\u6539\u547d\u4ee4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git remote origin\nset-url [url]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">2.\u5148\u5220\u540e\u52a0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git remote rm origin<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git remote add\norigin [url]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">3.\u76f4\u63a5\u4fee\u6539config\u6587\u4ef6<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git\u6709\u4e00\u4e2a\u5de5\u5177\u88ab\u79f0\u4e3agitconfig\uff0c\u5b83\u5141\u8bb8\u4f60\u83b7\u5f97\u548c\u8bbe\u7f6e\u914d\u7f6e\u53d8\u91cf\uff1b\u8fd9\u4e9b\u53d8\u91cf\u53ef\u4ee5\u63a7\u5236Git\u7684\u5916\u89c2\u548c\u64cd\u4f5c\u7684\u5404\u4e2a\u65b9\u9762\u3002\u8fd9\u4e9b\u53d8\u91cf\u53ef\u4ee5\u88ab\u5b58\u50a8\u5728\u4e09\u4e2a\u4e0d\u540c\u7684\u4f4d\u7f6e\uff1a <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u3000\u30001.\/etc\/gitconfig\n\u6587\u4ef6\uff1a\u5305\u542b\u4e86\u9002\u7528\u4e8e\u7cfb\u7edf\u6240\u6709\u7528\u6237\u548c\u6240\u6709\u5e93\u7684\u503c\u3002\u5982\u679c\u4f60\u4f20\u9012\u53c2\u6570\u9009\u9879\u2019&#8211;system\u2019 \u7ed9\ngitconfig\uff0c\u5b83\u5c06\u660e\u786e\u7684\u8bfb\u548c\u5199\u8fd9\u4e2a\u6587\u4ef6\u3002 <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u3000\u30002.~\/.gitconfig\n\u6587\u4ef6 \uff1a\u5177\u4f53\u5230\u4f60\u7684\u7528\u6237\u3002\u4f60\u53ef\u4ee5\u901a\u8fc7\u4f20\u9012&#8211;global\n\u9009\u9879\u4f7fGit \u8bfb\u6216\u5199\u8fd9\u4e2a\u7279\u5b9a\u7684\u6587\u4ef6\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u3000\u30003.\u4f4d\u4e8egit\u76ee\u5f55\u7684config\u6587\u4ef6 (\u4e5f\u5c31\u662f .git\/config) \uff1a\u65e0\u8bba\u4f60\u5f53\u524d\u5728\u7528\u7684\u5e93\u662f\u4ec0\u4e48\uff0c\u7279\u5b9a\u6307\u5411\u8be5\u5355\u4e00\u7684\u5e93\u3002\u6bcf\u4e2a\u7ea7\u522b\u91cd\u5199\u524d\u4e00\u4e2a\u7ea7\u522b\u7684\u503c\u3002\u56e0\u6b64\uff0c\u5728.git\/config\u4e2d\u7684\u503c\u8986\u76d6\u4e86\u5728\/etc\/gitconfig\u4e2d\u7684\u540c\u4e00\u4e2a\u503c\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u53d6\u56de\u8fdc\u7a0b\u4ed3\u5e93\u7684\u53d8\u5316\uff0c\u5e76\u4e0e\u672c\u5730\u5206\u652f\u5408\u5e76<br>\n$ git pull [remote] [branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u4e0a\u4f20\u672c\u5730\u6307\u5b9a\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93<br>\n$ git push [remote] [branch]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u5f3a\u884c\u63a8\u9001\u5f53\u524d\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5373\u4f7f\u6709\u51b2\u7a81<br>\n$ git push [remote] &#8211;force<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u63a8\u9001\u6240\u6709\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93<br>\n$ git push [remote] &#8211;all<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u672c\u5730\u5206\u679d\u5230\u8fdc\u7a0b\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git push origin localdev:dev<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f3a\u5236\u63d0\u4ea4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git push\n-f origin master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u83b7\u53d6\u8fdc\u7a0b\u5206\u652f\u5230\u672c\u5730\u975e\u6d3b\u52a8\u5206\u652f\uff0c\u76f4\u63a5\u8986\u76d6<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git fetch origin\nmaster:tmp<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git remote add origin git@xx.xx.xx.xx:repos\/xxx\/xxx\/xxx.git <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git push -u origin \u5206\u652f\u540d<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f53\u524d\u672c\u5730\u662fmaster\uff0c\u83b7\u53d6\u8fdc\u7aef\u7684dev<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git fetch origin dev <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u65f6\u83b7\u53d6\u4e86dev\u5230fetch_head\u4e2d\uff0c\u7136\u540emerge\uff0c\u6b64\u65f6\u53ef\u80fd\u4f1a\u6709\u51b2\u7a81\uff0c\u89e3\u51b3\u7136\u540e\u63d0\u4ea4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e0d\u80fd\u7528git fetch origin dev:master\uff0c\u8fd9\u79cd\u7684\u610f\u601d\u662f\u83b7\u53d6dev\u8986\u76d6\u5230master\u4e0a\uff0cmaster\u662f\u6d3b\u52a8\u5206\u652f\uff0c\u4f1a\u62a5\u9519\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u679c\u522b\u4eba\u4fee\u6539\u4e86\u4f60\u7684\u4ee3\u7801\u60f3\u5408\u5e76\u7ed9\u4f60\uff0c\u5148\u7ed9\u4f60\u53d1pull request\u9080\u8bf7\uff0c\u4f60\u89c9\u5f97\u5408\u9002\uff0c\u6b64\u65f6\u521b\u5efa\u5206\u652f\uff0c\u7136\u540epull<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git checkout -b \u67d0\u4eba-master master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git pull https\/\/github.com\/\u67d0\u4eba\u7684\/\u67d0\u9879\u76ee\u7684.git master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u65f6\u67e5\u770b\u6587\u4ef6\u53d8\u6210=======\u5206\u9694\u6587\u4ef6\uff0c\u5220\u9664\u4e0d\u9700\u8981\u7684\u5185\u5bb9\uff0c\u7136\u540e<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git commit -a \/\/\u628a\u4fee\u6539\u63d0\u4ea4\u5230\u8fd9\u4e2a\u4eba\u7684\u5206\u652f\u4e0a\uff0c\u4f1a\u63d0\u793a\u4f60\u6210\u529fmerge\u672c\u5730\u4ee3\u7801\u5230\u8fd9\u4e2a\u4eba\u7684\u4ee3\u7801\u5e93<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git checkout master \/\/\u5207\u6362\u5230\u81ea\u5df1\u7684\u5206\u652f\u4e0a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git merge \u67d0\u4eba-master \/\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u4ece\u547d\u4ee4\u884c\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u4ed3\u5e93<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">touch README.md<br> git init<br> git add README.md<br> git commit -m &#8220;first commit&#8221;<br> git remote add origin <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/bluemix.git\">http:\/\/thereisno.top\/xuenhua\/bluemix.git<\/a><br> git push -u origin master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u4ece\u547d\u4ee4\u884c\u63a8\u9001\u5df2\u7ecf\u521b\u5efa\u7684\u4ed3\u5e93<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git remote add origin <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/bluemix.git\">http:\/\/thereisno.top\/xuenhua\/bluemix.git<\/a><br> git push -u origin master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u63a8\u9001\u5230\u591a\u4e2a\u4f4d\u7f6e\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git remote add origin_new <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/RaspberryPI.git\">http:\/\/thereisno.top\/xuenhua\/RaspberryPI.git<\/a><br> git push -u origin_new master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u67e5\u770bconfig\u6587\u4ef6\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspBerryPI\/RaspberryPI\/.git $<\/strong> cat config&nbsp;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[core]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">repositoryformatversion\n= 0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">filemode =\ntrue<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">bare =\nfalse<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">logallrefupdates\n= true<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/192.168.3.18:3000\/xuenhua\/RaspberryPI.git\">http:\/\/192.168.3.18:3000\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[branch &#8220;master&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">remote = origin0 \u8fd9\u91cc\u7684\u8fdc\u7a0b\u4ed3\u5e93\uff0cfetch \u548cmerge\u7684\u9ed8\u8ba4\uff0c\u5426\u5219\u9700\u8981\u6307\u5b9amerge\u5206\u652f origin0\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">merge = refs\/heads\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin0&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/RaspberryPI.git\">http:\/\/thereisno.top\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin0\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u8ddf\u8e2a\u5173\u7cfb<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Merge \u7f3a\u7701\u5206\u652f\u540d\u6309\u7167\u8ddf\u8e2a\u5173\u7cfb\u5408\u5e76<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5efa\u7acb\u672c\u5730\u5230\u8fdc\u7a0b\u7684\u8ddf\u8e2a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;git push &#8211;set-upstream&nbsp; origin&nbsp;\nlocaldev:dev<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6216\u8005<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git branch -u origin\/dev<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>Git branch -vv <\/strong><strong>\u67e5\u770b\u672c\u5730\u548c\u8fdc\u7a0b\u4e4b\u95f4\u7684<\/strong><strong>track<\/strong><strong>\u5173\u7cfb<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5220\u9664\u8ddf\u8e2a\u5173\u7cfb<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git branch\n&#8211;unset-upstream<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u8ddf\u8e2a\u5173\u7cfb\u793a\u4f8b<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> git branch -u origin\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5206\u652f master \u8bbe\u7f6e\u4e3a\u8ddf\u8e2a\u6765\u81ea origin \u7684\u8fdc\u7a0b\u5206\u652f master\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> cat .git\/config&nbsp;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[core]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">repositoryformatversion\n= 0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">filemode =\ntrue<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">bare =\nfalse<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">logallrefupdates\n= true<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/192.168.3.18:3000\/xuenhua\/RaspberryPI.git\">http:\/\/192.168.3.18\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[branch\n&#8220;master&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">remote =\norigin<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">merge =\nrefs\/heads\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin0&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/RaspberryPI.git\">http:\/\/thereisno.top\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin0\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> git branch -vv<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">* master\n9b71642 [origin\/master] \u8bfb\u53d6autogit<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> git branch -u origin0\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5206\u652f master \u8bbe\u7f6e\u4e3a\u8ddf\u8e2a\u6765\u81ea origin0 \u7684\u8fdc\u7a0b\u5206\u652f master\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> cat .git\/config&nbsp;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[core]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">repositoryformatversion\n= 0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">filemode =\ntrue<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">bare =\nfalse<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">logallrefupdates\n= true<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/192.168.3.18:3000\/xuenhua\/RaspberryPI.git\">http:\/\/192.168.3.18\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[branch\n&#8220;master&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">remote =\norigin0<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">merge =\nrefs\/heads\/master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">[remote\n&#8220;origin0&#8221;]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">url = <a href=\"http:\/\/thereisno.top:3300\/xuenhua\/RaspberryPI.git\">http:\/\/thereisno.top\/xuenhua\/RaspberryPI.git<\/a><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">fetch =\n+refs\/heads\/*:refs\/remotes\/origin0\/*<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>pi@raspberrypi<\/strong>:<strong>~\/RaspGit\/RaspberryPI $<\/strong> git branch -vv<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">* master\n9b71642 [origin0\/master] \u8bfb\u53d6autogit<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e5d\u3001\u64a4\u9500<br>\n# \u6062\u590d\u6682\u5b58\u533a\u7684\u6307\u5b9a\u6587\u4ef6\u5230\u5de5\u4f5c\u533a(mac \u4e0d\u7ba1\u7528)<br>\n$ git checkout &#8212; [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6062\u590d\u67d0\u4e2acommit\u7684\u6307\u5b9a\u6587\u4ef6\u5230\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a<br>\n$ git checkout [commit] [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6062\u590d\u6682\u5b58\u533a\u7684\u6240\u6709\u6587\u4ef6\u5230\u5de5\u4f5c\u533a(mac \u4e0d\u7ba1\u7528)<br>\n$ git checkout .<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f53\u6267\u884c &#8220;git\ncheckout .&#8221; \u6216\u8005 &#8220;git checkout &#8212; &lt;file&gt;&#8221; \u547d\u4ee4\u65f6\uff0c\u7528\u6682\u5b58\u533a\u5168\u90e8\u6216\u6307\u5b9a\u7684\u6587\u4ef6\u66ff\u6362\u5de5\u4f5c\u533a\u7684\u6587\u4ef6\u3002\u8fd9\u4e2a\u64cd\u4f5c\u5f88\u5371\u9669\uff0c\u4f1a\u6e05\u9664\u5de5\u4f5c\u533a\u4e2d\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u6539\u52a8\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7528 HEAD \u6307\u5411\u7684 master\n\u5206\u652f\u4e2d\u7684\u5168\u90e8\u6216\u8005\u90e8\u5206\u6587\u4ef6\u66ff\u6362\u6682\u5b58\u533a\u548c\u4ee5\u53ca\u5de5\u4f5c\u533a\u4e2d\u7684\u6587\u4ef6,\u6e05\u9664\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u4e2d\u672a\u63d0\u4ea4\u7684\u6539\u52a8\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git checkout HEAD .<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git checkout HEAD &lt;file&gt;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git reset HEAD &lt;file&gt; \/\/\u529f\u80fd\u76f8\u540c<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u7f6e\u6682\u5b58\u533a\u7684\u6307\u5b9a\u6587\u4ef6\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4\uff0c\u4f46\u5de5\u4f5c\u533a\u4e0d\u53d8<br>\n$ git reset \u53ef\u53d6\u6d88add\u7684\u4fee\u6539<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git reset [file]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u7f6e\u6682\u5b58\u533a\u4e0e\u5de5\u4f5c\u533a\uff0c\u4e0e\u4e0a\u4e00\u6b21commit\u4fdd\u6301\u4e00\u81f4,&nbsp;\u53d6\u6d88\u6240\u6709\u4fee\u6539(windows \u4e0b\u53ef\u80fd\u6709bug\uff0creset\u540e\u9700\u8981checkout)<br>\n$ git reset &#8211;hard<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\u4e3a\u6307\u5b9acommit\uff0c\u540c\u65f6\u91cd\u7f6e\u6682\u5b58\u533a\uff0c\u4f46\u5de5\u4f5c\u533a\u4e0d\u53d8<br>\n$ git reset [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u7f6e\u5f53\u524d\u5206\u652f\u7684HEAD\u4e3a\u6307\u5b9acommit\uff0c\u540c\u65f6\u91cd\u7f6e\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\uff0c\u4e0e\u6307\u5b9acommit\u4e00\u81f4<br>\n$ git reset &#8211;hard [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u91cd\u7f6e\u5f53\u524dHEAD\u4e3a\u6307\u5b9acommit\uff0c\u4f46\u4fdd\u6301\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u4e0d\u53d8<br>\n$ git\nreset &#8211;keep [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git reset\u4e4b\u540e\u5982\u679c\u8981\u6062\u590d\u600e\u4e48\u529e<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git reflog\u67e5\u770b\u5b8c\u5168\u5386\u53f2<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># git revert \u64a4\u9500\n\u67d0\u6b21\u64cd\u4f5c\uff0c\u6b64\u6b21\u64cd\u4f5c\u4e4b\u524d\u548c\u4e4b\u540e\u7684commit\u548chistory\u90fd\u4f1a\u4fdd\u7559\uff0c\u5e76\u4e14\u628a\u8fd9\u6b21\u64a4\u9500\u4f5c\u4e3a\u4e00\u6b21\u6700\u65b0\u7684\u63d0\u4ea4<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git revert [commit]<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728git\u4f7f\u7528\u4e2d\u5982\u679c\u63d0\u4ea4\u9519\u8bef\u7684\u4ee3\u7801\u81f3\u8fdc\u7a0b\u670d\u52a1\u5668\uff0c\u53ef\u4ee5\u4f7f\u7528git revert\n\u547d\u4ee4\u56de\u6eda\u5355\u6b21commit\u5e76\u4e14\u4e0d\u5f71\u54cd\u5176\u4ed6commit\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u56de\u6eda\u6700\u65b0\u4e00\u6b21\u7684\u63d0\u4ea4\u8bb0\u5f55\uff1a <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git revert HEAD<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u56de\u6eda\u524d\u4e00\u6b21\u7684\u63d0\u4ea4\u8bb0\u5f55 \uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git revert HEAD^<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5bf9\u5386\u53f2\u4e0a\u7684commit\u56de\u6eda\uff1a <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git revert &lt;commit id&gt;<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u56de\u6eda\u5386\u53f2commit\u5f88\u5bb9\u6613\u4ea7\u751f\u6587\u4ef6\u51b2\u7a81\uff0c\u9700\u8981\u505a\u597d\u51b2\u7a81\u5904\u7406\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"># \u6682\u65f6\u5c06\u672a\u63d0\u4ea4\u7684\u53d8\u5316\u79fb\u9664\uff0c\u7a0d\u540e\u518d\u79fb\u5165<br>\n$ git stash<br>\n$ git stash pop<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">Git rebase \u7c7b\u4f3c merge\uff0c\u4f46\u662f\u4e0d\u5206\u53c9\uff0c\u5220\u9664\u5408\u5e76\u524d\u7684\u5206\u53c9\u5408\u6210\u4e00\u4e2a\uff0c\u5408\u5e76\u65f6\u4f1a\u6bcf\u4e2a\u63d0\u4ea4\u8fdb\u884c\u786e\u8ba4\uff0c\u53ef\u4ee5\u8df3\u8fc7\uff0c\u6700\u540e\u4e00\u4e2a\u8fdb\u884c\u5408\u5e76&#8211;skip<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git rebase\uff1a\u8fd9\u662f\u4e00\u4e2a \u66f4\u6539\u5386\u53f2 \u7684\u64cd\u4f5c\uff0c\u6240\u4ee5\u4e0d\u8981\u6307\u671b\u4f60\u6539\u4e86\u5386\u53f2\u7136\u540e\u5c31\u987a\u5229\u628a\u4f60\u7be1\u6539\u591f\u7684\u5386\u53f2\u63d0\u4ea4\u4e0a\u53bb\u3002rebase\u4e4b\u540e\u4f1a\u518d\u6b21push\u4f1a\u63d0\u793a\u9700\u8981\u89e3\u51b3\u51b2\u7a81<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5341\u3001\u5176\u4ed6<br>\n# \u751f\u6210\u4e00\u4e2a\u53ef\u4f9b\u53d1\u5e03\u7684\u538b\u7f29\u5305<br>\n$ git archive<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git prune&nbsp; \u4ece\u5bf9\u8c61\u6570\u636e\u5e93\u4e2d\u5220\u9664\u6240\u6709\u4e0d\u53ef\u8bbf\u95ee\u7684\u5bf9\u8c61<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728\u5927\u591a\u6570\u60c5\u51b5\u4e0b\uff0c\u7528\u6237\u4e0d\u9700\u8981git prune\u76f4\u63a5\u8c03\u7528\uff0c\u800c\u662f\u5e94\u8be5\u8c03\u7528git gc\uff0c\u5b83\u53ef\u4ee5\u5904\u7406\u4fee\u526a\u4ee5\u53ca\u8bb8\u591a\u5176\u4ed6\u5185\u52a1\u5904\u7406\u4efb\u52a1\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git \u5ffd\u7565\u63d0\u4ea4\u67d0\u4e2a\u6307\u5b9a\u7684\u6587\u4ef6(\u4e0d\u4ece\u7248\u672c\u5e93\u4e2d\u5220\u9664)\uff08elipse&gt;team&gt;advanced\uff09<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ $ git update-index\n&#8211;assume-unchanged ZHYW6\/WEB-INF\/classes\/product.xml<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git status<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u65f6\u5ffd\u7565product.xml\u6587\u4ef6\u8ddf\u8e2a\u4e4b\u540e\u518d\u67e5\u770b\u72b6\u6001\uff0c\u53d1\u73b0\u5df2\u7ecf\u6ca1\u6709\u663e\u793aproduct.xml\u7684\u72b6\u6001\u4e86\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u9644\u53d6\u6d88\u5ffd\u7565\u6307\u4ee4\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git update-index\n&#8211;no-assume-unchanged ZHYW6\/WEB-INF\/classes\/product.xml<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git merge \u5408\u5e76\u51b2\u7a81\u65f6,&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\u8868\u793a\u5f53\u524d\u7684\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&lt;&lt;&lt;&lt;&lt;&lt;&lt;\nHEAD<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">@Override<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">=======<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&gt;&gt;&gt;&gt;&gt;&gt;&gt;\nd4f872982e631d9b0e18e6599d34226a8b5ac57f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u65e0\u6cd5\u62c9\u53d6\u65e0\u76f8\u5173\u5386\u53f2\u7684\u4ed3\u5e93\uff0cfatal: refusing to\nmerge unrelated histories<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">$ git pull origin master\n&#8211;allow-unrelated-histories<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">diff\u6bd4\u8f83\u7531\u4e8e\u7f16\u7801\u7b49\u539f\u56e0\uff0c\u5bfc\u81f4\u6574\u4e2a\u6587\u4ef6\u5dee\u5f02<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">-a,&#8211;text\n\u628a\u6240\u6709\u6587\u4ef6\u5f53\u505a\u6587\u672c\u6587\u4ef6\u9010\u884c\u6bd4\u8f83<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">-b,&#8211;ignore-space-change\n\u5ffd\u7565\u7a7a\u683c\u4ea7\u751f\u7684\u53d8\u5316<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">-B,&#8211;ignore-blank-lines\n\u5ffd\u7565\u7a7a\u767d\u884c\u7684\u53d8\u5316<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">-E,&#8211;ignore-all-space\n\u5ffd\u7565\u7531\u4e8eTab\u6269\u5c55\u800c\u5bfc\u81f4\u7684\u53d8\u5316<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">-q,&#8211;brief\n\u4ec5\u8f93\u51fa\u6587\u4ef6\u662f\u5426\u6709\u5dee\u5f02\uff0c\u4e0d\u62a5\u544a\u8be6\u7ec6\u5dee\u5f02<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">&nbsp;diff -rabBEq&nbsp; client \/d\/\u79fb\u52a8\u529e\u516c_build\/htxx@fiberhometest_pre_release_42\/htxx@fiberhometest_pre_release\/client<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u53ea\u68c0\u51faGit\u4ed3\u5e93\u67d0\u4e2a\u6587\u4ef6\u5939\uff08\u7a00\u758f\u68c0\u51fa\uff09<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u672c\u5730\u65b0\u5efa\u7a7agit\u6863\uff1a\n<br>\ngit init <br>\n\u542f\u7528sparse-checkout\uff1a<br>\ngit\nconfig core.sparsecheckout true <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u8bbe\u5b9a\u68c0\u51fa\u54ea\u4e9b\u6587\u4ef6\uff1a<br>\necho &#8220;resource\/spring&#8221;\n&gt;&gt; .git\/info\/sparse-checkout <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u8bbe\u5b9aremote\u6e90\uff1a<br> \u00a0git remote add origin <a href=\"http:\/\/172.19.6.89:3000\/aisino\/CRM_AOS7.git\">http:\/\/172.19.6.89\/xuenhua\/XXX.git<\/a> <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">pull\u5230\u672c\u5730\uff1a<br>\ngit pull origin master <\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6ce8\uff1apush\u5230\u8fdc\u7a0b\u4e4b\u524d\u4ecd\u7136\u9700\u8981\u901a\u8fc7pull\u6765\u9632\u6b62\u51b2\u7a81\u3002\u63d0\u4ea4\u6d4b\u8bd5\u53ef\u7528\uff0c\u4e4b\u524d\u53ef\u80fd\u56e0\u4e3a\u6587\u4ef6\u592a\u5927\u5bfc\u81f4\u5931\u8d25\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u5173\u95ed sparse checkout\u529f\u80fd\uff0c<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4ec5\u4ec5\u4fee\u6539\u8bbe\u7f6e\uff0c\u5c06core.sparsecheckout\u8bbe\u4e3afalse\u662f\u4e0d\u751f\u6548\u7684\uff0c\u9700\u8981\u4fee\u6539\n.git\/info\/sparse-checkout \u6587\u4ef6\uff0c\u7528\u4e00\u4e2a\u201d*\u201c\u53f7\u66ff\u4ee3\u5176\u4e2d\u7684\u5185\u5bb9\uff0c\u7136\u540e\u6267\u884c checkout \u6216 read-tree \u547d\u4ee4\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u6d45\u514b\u9686<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u679c\u53ea\u62c9\u53d6\u6700\u8fd1\u4e00\u6b21\u7684\u53d8\u66f4\uff0c\u5ffd\u7565\u4ee5\u524d\u7684\u53d8\u66f4\u8bb0\u5f55\uff0c\u5728\u62c9\u53d6\u65f6\u53ef\u4ee5\u52a0\u53c2\u6570depth\uff0c\u5982<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git pull &#8211;depth=1 origin master<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>sparse-checkout \u6587\u4ef6\u8bbe\u7f6e<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5b50\u76ee\u5f55\u7684\u5339\u914d\u5728\nsparse-checkout \u6587\u4ef6\u4e2d\uff0c\u5982\u679c\u76ee\u5f55\u540d\u79f0\u524d\u5e26\u659c\u6760\uff0c\u5982\/docs\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\uff0c\u5c06\u53ea\u5339\u914d\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u7684docs\u76ee\u5f55\uff0c\u5982\u679c\u76ee\u5f55\u540d\u79f0\u524d\u4e0d\u5e26\u659c\u6760\uff0c\u5982docs\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\uff0c\u5176\u4ed6\u76ee\u5f55\u4e0b\u5982\u679c\u4e5f\u6709\u8fd9\u4e2a\u540d\u79f0\u7684\u76ee\u5f55\uff0c\u5982test\/docs\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e5f\u80fd\u88ab\u5339\u914d\u3002\u800c\u5982\u679c\u5199\u4e86\u591a\u7ea7\u76ee\u5f55\uff0c\u5982docs\/05\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\uff0c\u5219\u4e0d\u7ba1\u524d\u9762\u662f\u5426\u5e26\u6709\u659c\u6760\uff0c\u90fd\u53ea\u5339\u914d\u9879\u76ee\u6839\u76ee\u5f55\u4e0b\u7684\u76ee\u5f55\uff0c\u5982test\/docs\/05\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4e0d\u80fd\u88ab\u5339\u914d\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u901a\u914d\u7b26 \u201c<em>\u201c (\u661f\u53f7)\u5728 sparse-checkout \u6587\u4ef6\u4e2d\uff0c\u652f\u6301\u901a\u914d\u7b26 \u201c<\/em>\u201c\uff0c\u5982\u53ef\u4ee5\u5199\u6210\u4ee5\u4e0b\u683c\u5f0f\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">*docs<br>\n\/index.*<br>\n*.gif<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>\u6392\u9664\u9879<\/strong><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u201c!\u201d (\u611f\u53f9\u53f7)\u5728\nsparse-checkout \u6587\u4ef6\u4e2d\uff0c\u4e5f\u652f\u6301\u6392\u9664\u9879 \u201c!\u201d\uff0c\u5982\u53ea\u60f3\u6392\u9664\u6392\u9664\u9879\u76ee\u4e0b\u7684 \u201cdocs\u201d \u76ee\u5f55\uff0c\u53ef\u4ee5\u6309\u5982\u4e0b\u683c\u5f0f\u5199\uff1a<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\/*<br>\n!\/docs\/<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5f88\u50cf .gitignore\u7684\u5199\u6cd5<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u8981\u6ce8\u610f\u4e00\u70b9\uff1a\u5982\u679c\u8981\u5173\u95edsparsecheckout\u529f\u80fd\uff0c\u5168\u53d6\u6574\u4e2a\u9879\u76ee\u5e93\uff0c\u53ef\u4ee5\u5199\u4e00\u4e2a\u201d<em>\u201c\u53f7\uff0c\u4f46\u5982\u679c\u6709\u6392\u9664\u9879\uff0c\u5fc5\u987b\u5199\u201d\/<\/em>\u201c\uff0c\u540c\u65f6\u6392\u9664\u9879\u8981\u5199\u5728\u901a\u914d\u7b26\u540e\u9762\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u5b9e\u6d4b\u65f6\u53d1\u73b0\uff0c\u4e0d\u5728sparse-checkout\u7684\u6587\u4ef6\uff0cpull\n\u662f\u4e0d\u4f1a\u62c9\u53d6\u4e86\uff0c\u4f46\u662f\u6dfb\u52a0\u8fd8\u662f\u4f1a\u9ed8\u8ba4\u6dfb\u52a0\u7684<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#&nbsp;\u5220\u9664&nbsp;untracked&nbsp;files<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#&nbsp;\u8fde&nbsp;untracked&nbsp;\u7684\u76ee\u5f55\u4e5f\u4e00\u8d77\u5220\u6389<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-fd<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#&nbsp;\u8fde&nbsp;gitignore&nbsp;\u7684untrack&nbsp;\u6587\u4ef6\/\u76ee\u5f55\u4e5f\u4e00\u8d77\u5220\u6389&nbsp;\uff08\u614e\u7528\uff0c\u4e00\u822c\u8fd9\u4e2a\u662f\u7528\u6765\u5220\u6389\u7f16\u8bd1\u51fa\u6765\u7684&nbsp;.o\u4e4b\u7c7b\u7684\u6587\u4ef6\u7528\u7684\uff09<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-xfd<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">#&nbsp;\u5728\u7528\u4e0a\u8ff0&nbsp;git&nbsp;clean&nbsp;\u524d\uff0c\u5899\u88c2\u5efa\u8bae\u52a0\u4e0a&nbsp;-n&nbsp;\u53c2\u6570\u6765\u5148\u770b\u770b\u4f1a\u5220\u6389\u54ea\u4e9b\u6587\u4ef6\uff0c\u9632\u6b62\u91cd\u8981\u6587\u4ef6\u88ab\u8bef\u5220<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-nxfd<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-nf<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git&nbsp;clean&nbsp;-nfd<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u76d1\u63a7\u6587\u4ef6\u6539\u52a8<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git log &#8211;name-status\n\u6bcf\u6b21\u4fee\u6539\u7684\u6587\u4ef6\u5217\u8868, \u663e\u793a\u72b6\u6001<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git log &#8211;name-only\n\u6bcf\u6b21\u4fee\u6539\u7684\u6587\u4ef6\u5217\u8868<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git log &#8211;stat\n\u6bcf\u6b21\u4fee\u6539\u7684\u6587\u4ef6\u5217\u8868, \u53ca\u6587\u4ef6\u4fee\u6539\u7684\u7edf\u8ba1<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git whatchanged\n\u6bcf\u6b21\u4fee\u6539\u7684\u6587\u4ef6\u5217\u8868<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git whatchanged\n&#8211;stat \u6bcf\u6b21\u4fee\u6539\u7684\u6587\u4ef6\u5217\u8868, \u53ca\u6587\u4ef6\u4fee\u6539\u7684\u7edf\u8ba1<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">git show\n\u663e\u793a\u6700\u540e\u4e00\u6b21\u7684\u6587\u4ef6\u6539\u53d8\u7684\u5177\u4f53\u5185\u5bb9<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u4e00\u3001\u65b0\u5efa\u4ee3\u7801\u5e93 # \u5728\u5f53\u524d\u76ee\u5f55\u65b0\u5efa\u4e00\u4e2aGit\u4ee3\u7801\u5e93 $ git init # \u65b0\u5efa\u4e00\u4e2a\u76ee\u5f55\uff0c\u5c06\u5176\u521d\u59cb\u5316\u4e3aGit &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/thereisno.top\/?p=37\" class=\"more-link\">\u7ee7\u7eed\u9605\u8bfb<span class=\"screen-reader-text\">\u201c\u5e38\u7528 Git \u547d\u4ee4\u6e05\u5355\u201d<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/37","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=37"}],"version-history":[{"count":1,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/37\/revisions"}],"predecessor-version":[{"id":38,"href":"https:\/\/thereisno.top\/index.php?rest_route=\/wp\/v2\/posts\/37\/revisions\/38"}],"wp:attachment":[{"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=37"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=37"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/thereisno.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=37"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}