{"id":9811,"date":"2023-03-10T13:57:20","date_gmt":"2023-03-10T05:57:20","guid":{"rendered":"http:\/\/123.57.164.21\/?p=9811"},"modified":"2023-03-10T13:57:20","modified_gmt":"2023-03-10T05:57:20","slug":"git%e7%9a%84%e5%b8%b8%e7%94%a8%e5%91%bd%e4%bb%a4%e4%bb%8b%e7%bb%8d","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=9811","title":{"rendered":"Git\u7684\u5e38\u7528\u547d\u4ee4\u4ecb\u7ecd"},"content":{"rendered":"\n

Git\u6574\u4f53\u5de5\u4f5c\u6d41\u7a0b<\/strong><\/p>\n\n\n\n

\n\n\n\n
\"\"<\/figure><\/div>\n\n\n\n
  • Workspace\uff1a\u5de5\u4f5c\u533a<\/li>
  • Index \/ Stage\uff1a\u6682\u5b58\u533a<\/li>
  • Repository\uff1a\u4ed3\u5e93\u533a\uff08\u6216\u672c\u5730\u4ed3\u5e93\uff09<\/li>
  • Remote\uff1a\u8fdc\u7a0b\u4ed3\u5e93<\/li><\/ul>\n\n\n\n

    \u4e00 \u7248\u672c\u4ed3\u5e93<\/strong>:<\/p>\n\n\n\n

    \u00a01.\u901a\u8fc7\u547d\u4ee4 git init \u628a\u8fd9\u4e2a\u76ee\u5f55\u53d8\u6210git\u53ef\u4ee5\u7ba1\u7406\u7684\u4ed3\u5e93<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \uff08\u4f1a\u751f\u6210.git \u6587\u4ef6\uff09\u9ed8\u8ba4.git \u6587\u4ef6\u4e0d\u663e\u793a<\/p>\n\n\n\n

    2. git add\u00a0 xxxxx\u00a0 \uff08\u5c06\u5de5\u4f5c\u533a\u7684\u6307\u5b9a\u6587\u4ef6\u6dfb\u52a0\u5230 \u6682\u5b58\u533a\u4e2d\uff09<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u6ca1\u6709\u4efb\u4f55\u63d0\u793a\uff0c\u8bf4\u660e\u5df2\u7ecf\u6dfb\u52a0\u6210\u529f\u4e86<\/p>\n\n\n\n

    3. git commit -m\u00a0 \u2018\u4e00\u4e9b\u63d0\u4ea4\u6ce8\u91ca\u2019 \uff08\u628a\u6587\u4ef6\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff09<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    4. git status\u00a0 \uff08\u67e5\u770b\u662f\u5426\u6709\u6587\u4ef6\u6ca1\u6709\u88ab\u63d0\u4ea4\uff09<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u5c55\u793a\u8bf4\u660e\u6ca1\u6709\u4efb\u4f55\u6587\u4ef6\u672a\u63d0\u4ea4\uff0c\u4f46\u662f\u6211\u73b0\u5728\u7ee7\u7eed\u6765\u6539\u4e0breadme.txt\u5185\u5bb9\uff0c\u4e4b\u540e\u5f00\u59cb\u4fee\u6539reademe.txt\u5185\u5bb9\u540e\uff0c\u518d\u6267\u884c\u4e0b\uff1agit status<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u5c55\u793a\u8bf4\u660e\u6ca1\u6709\u4efb\u4f55\u6587\u4ef6\u672a\u63d0\u4ea4\uff0c\u4f46\u662f\u6211\u73b0\u5728\u7ee7\u7eed\u6765\u6539\u4e0breadme.txt\u5185\u5bb9\uff0c\u4e4b\u540e\u5f00\u59cb\u4fee\u6539reademe.txt\u5185\u5bb9\u540e\uff0c\u518d\u6267\u884c\u4e0b\uff1agit status<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    readme.txt \u6587\u4ef6\u5df2\u7ecf\u88ab\u4fee\u6539\uff0c\u4f46\u662f\u672a\u88ab\u63d0\u4ea4\u7684\u4fee\u6539<\/p>\n\n\n\n

    (changes not stateg\u00a0 \u00a0: \u4fee\u6539\u7684\u6587\u4ef6 \uff0c\u00a0 Untracked files \uff1a \u65b0\u589e\u6587\u4ef6 , Unmerged path:\u00a0 \u6709\u51b2\u7a81)<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n
    \"\"<\/figure><\/div>\n\n\n\n

    5. git\u00a0 diff\u00a0 \u00a0xx\u00a0 \uff08 \u53ef\u4ee5\u67e5\u770b\u4fee\u6539\u7684\u5185\u5bb9\uff09\u00a0<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u4e8c\u3001\u7248\u672c\u56de\u9000\uff1a<\/strong><\/p>\n\n\n\n

    \n\n\n\n

    \u5982\u4e0a\uff0c\u6211\u4eec\u5df2\u7ecf\u5b66\u4f1a\u4e86\u4fee\u6539\u6587\u4ef6\uff0c\u73b0\u5728\u6211\u7ee7\u7eed\u5bf9readme.txt\u6587\u4ef6\u8fdb\u884c\u4fee\u6539\uff0c\u518d\u589e\u52a0\u4e00\u884c\uff0c<\/p>\n\n\n\n

    \u5185\u5bb9\u4e3a33333333333333.\u7ee7\u7eed\u6267\u884c\u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u00a01. git log\u00a0 \uff08 \u67e5\u770b\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff09<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u5982\u679c\u5acc\u4e0a\u9762\u663e\u793a\u7684\u4fe1\u606f\u592a\u591a\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 git log –pretty=oneline \u6f14\u793a\u5982\u4e0b\uff1a<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    2.\u00a0 git reset –hard\u00a0 HEAD^ (\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u7248\u672c)<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u00a03. cat\u00a0 \u00a0xxx\u00a0 \uff08\u67e5\u770b\u6587\u4ef6\u5185\u5bb9\uff09\u00a0<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    4.\u00a0 git reflog \uff08\u67e5\u770b\u6240\u6709\u5386\u53f2\u8bb0\u5f55\uff08\u4e0d\u53d7\u56de\u9000\u5f71\u54cd\uff09\uff09<\/p>\n\n\n\n

    \"\"<\/figure><\/div>\n\n\n\n

    \u5982\u679c\u60f3\u6062\u590d\u5230\u539f\u6709\u5230\u7248\u672c\uff0c\u4ece\u8fd9\u91cc\u67e5\u770b\u5bf9\u5e94\u5230\u7248\u672c\u53f7\uff0c\u6267\u884c\uff1a git reset –hrad 6fcfc89<\/p>\n\n\n\n

    \u4e09\u3001 Git\u64a4\u9500\u4fee\u6539 \u548c \u5220\u9664\u6587\u4ef6<\/strong><\/p>\n\n\n\n

    \n\n\n\n

    1. \u64a4\u9500\u4fee\u6539<\/p>\n\n\n\n

    \u5982\u679c\u6211\u73b0\u5728\u4fee\u6539\u4e86\u4e00\u4e9b\u6587\u4ef6\uff0c\u4f46\u5e76\u6ca1\u6709\u63d0\u4ea4\u5230\u6682\u5b58\u533a<\/p>\n\n\n\n

    \u7b80\u4fbf\u65b9\u6cd5\uff1agit checkout -- \u6587\u4ef6\u540d  \u5373\u53ef\u5b9e\u73b0<\/pre>\n\n\n\n
    \u5982\u679c\u4fee\u6539\u4e86\u4e00\u4e9b\u6587\u4ef6\uff0c\u5e76\u4e14\u5df2\u7ecf\u63d0\u4ea4\u5230\u4e86\u6682\u5b58\u533a\u4e86,\u5219\u6ca1\u6709\u6548\u679c\u4e86<\/p>\n\n\n\n
    2. \u5220\u9664\u6587\u4ef6<\/p>\n\n\n\n
    rm   xxx  <\/pre>\n\n\n\n
    \u5220\u9664\u4efb\u52a1\u540e\uff0c\u53ea\u8981\u6ca1\u6709\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff08\u4e5f\u5c31\u662f\u8bf4 \u6ca1\u6709commit \uff09\uff0c\u901a\u8fc7git checkout — \u6587\u4ef6\u540d\u5373\u53ef\u6062\u590d<\/p>\n\n\n\n
    \u56db\u3001\u5206\u652f<\/strong><\/p>\n\n\n\n
    \n\n\n\n
    • git checkout -b dev : \u521b\u5efa\u5e76\u5207\u6362\u5206\u652f \uff08\u7b49\u4e8e 2\u30013 \u64cd\u4f5c\uff09<\/li>
    • git checkout xxx : \u5207\u6362\u5206\u652f<\/li>
    • git branch xx : \u521b\u5efa\u5206\u652f<\/li>
    • git branch \u67e5\u770b\u5f53\u524d\u5206\u652f<\/li>
    • git merge xx \uff1a \u5408\u5e76\u5206\u652f (HEAD\uff1a \u5f53\u524d ==== \u4e0b \u5408\u5e76\u5206\u652f\u7684\u5185\u5bb9)<\/li><\/ul>\n\n\n\n
      \"\"<\/figure><\/div>\n\n\n\n
      • git branch -d xx \uff1a \u5220\u9664\u5206\u652f<\/li><\/ul>\n\n\n\n
        \u4e94\u3001Bug\u5206\u652f<\/strong><\/p>\n\n\n\n
        \n\n\n\n
        \u5728\u67d0\u4e9b\u573a\u666f\u4e2d\uff0c\u76ee\u524d\u5728\u5f53\u524d\u7684\u5206\u652f\u5f00\u53d1\u4e2d\uff0c\u4f46\u7a81\u7136\u53d1\u73b0\u6b64\u5206\u652f\u539f\u6709\u7684\u4e00\u4e2a\u529f\u80fd\u6709bug\uff0c\u4f46\u5f53\u524d\u5df2\u7ecf\u5728\u6b64\u5206\u652f\u5f00\u53d1\u65b0\u4f46\u529f\u80fd\u4e86\uff0c\u800c\u4e14\u5e76\u4e0d\u60f3\u63d0\u4ea4\uff0c\u6b64\u65f6\u5e94\u8be5\u600e\u4e48\u529e\u5462\uff1f<\/p>\n\n\n\n
        \uff081\uff09git stash \u80fd\u591f\u4fdd\u5b58\u5f53\u524d\u7684\u6240\u6709\u5185\u5bb9\n\n\uff082\uff09git checkout -b dev   \u53bb\u5904\u7406bug\n\n\uff083\uff09git merge dev    \u5408\u5e76\u5206\u652f\uff0c\u89e3\u51b3\u51b2\u7a81\n\n\uff084\uff09git stash  apply   \u6062\u590d  \n\n\uff085\uff09git stash   drop    \u6062\u590d\u7684\u540c\u65f6\uff0c\u5220\u9664 stash \u5bf9\u5e94\u7684\u5185\u5bb9\n\n\uff086\uff09git  stash  list    \u67e5\u770b  \u6240\u4ee5\u88ab\u4fdd\u5b58\u7684 stash<\/pre>\n\n\n\n
        \u00a0 \u516d\u3001\u5176\u4ed6<\/strong><\/p>\n\n\n\n
        \n\n\n\n
        git remote \uff1a \u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u4fe1\u606f<\/p>\n\n\n\n
        git remote -v : \u67e5\u770b\u8be6\u7ec6\u4fe1\u606f<\/p>\n\n\n\n
        \"\"<\/figure><\/div>\n","protected":false},"excerpt":{"rendered":"
        Git\u6574\u4f53\u5de5\u4f5c\u6d41\u7a0b Workspace\uff1a\u5de5\u4f5c\u533a Index \/ Stage\uff1a\u6682\u5b58\u533a Repository\uff1a\u4ed3\u5e93 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[10],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9811"}],"collection":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=9811"}],"version-history":[{"count":1,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9811\/revisions"}],"predecessor-version":[{"id":9830,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/9811\/revisions\/9830"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=9811"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=9811"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=9811"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}