{"id":37718,"date":"2023-05-24T00:36:25","date_gmt":"2024-02-11T21:14:53","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/"},"modified":"2024-04-30T05:41:08","modified_gmt":"2024-04-29T21:41:08","slug":"%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/","title":{"rendered":"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981"},"content":{"rendered":"

\u547d\u4ee4\u901f\u67e5\u8868<\/h2>\n

\u8ba9\u6211\u4eec\u4ee5\u4f8b\u5b50\u6574\u7406\u4e00\u4e0b\u5e38\u7528\u547d\u4ee4\u7684\u547d\u4ee4\u540d\u79f0\u548c\u4f7f\u7528\u65b9\u6cd5\u3002<\/p>\n

\n
\u30b3\u30de\u30f3\u30c9\u4f7f\u3044\u65b9\u4f8b
\nbranch$ git branch <\u30d6\u30e9\u30f3\u30c1\u540d><\/code>$ git branch sub<\/code>“sub”\u3068\u3044\u3046\u65b0\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210checkout$ git checkout <\u30d6\u30e9\u30f3\u30c1\u540d><\/code>$ git checkout sub<\/code>“sub”\u3068\u3044\u3046\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048fetch$ git fetch <\u30ea\u30e2\u30fc\u30c8\u540d><\/code>$ git fetch origin<\/code>
\nmerge$ git merge <\u30ea\u30e2\u30fc\u30c8\u540d>\/<\u30d6\u30e9\u30f3\u30c1\u540d><\/code>$ git merge origin\/master<\/code>
\n\u3003$ git merge <\u30d6\u30e9\u30f3\u30c1\u540d><\/code>“$ git merge master<\/code>(\u30ea\u30e2\u30fc\u30c8\u540d\u306f\u7701\u7565\u53ef\u80fd)<\/div>\n<\/div>\n

\u5c06\u521b\u5efa\u7684\u5206\u652f\u540d\u63a8\u9001\u5230origin\uff08\u8fdc\u7a0b\u4ed3\u5e93\uff09\u3002<\/p>\n

1. \u5982\u4f55\u5c06\u4ee3\u7801\u63a8\u9001\u5230GitHub\u4e0a\u3002<\/h1>\n
\"\u7121\u984c.png\"<\/div>\n

\u5f53\u60f3\u8981\u5c06\u66f4\u6539\u63a8\u9001\u81f3\u4e3b\u5206\u652f\u65f6
\n\u5c06\u672c\u5730\u7684\u4e3b\u5206\u652f\u540d\u79f0\u4ece master \u6539\u4e3a main
\n$ git branch -m master main<\/p>\n

\u5f53\u4f60\u60f3\u8981\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u5e76\u8fdb\u884c\u63a8\u9001\u65f6\uff0c\u5728\u8f93\u5165\u4ee5\u4e0b\u547d\u4ee4\u540e\uff0c\u5c06\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff01
\n$ git checkout -b <\u5206\u652f\u540d><\/p>\n

6 $ git push origin <\u5206\u652f\u540d>
\n\u5206\u652f\u540d\u9ed8\u8ba4\u4e3amain
\n\uff08\u4ee5\u524d\u4e3amaster\uff0c\u8bf7\u6ce8\u610f\uff01\uff09<\/p>\n

\"\u30b3\u30e1\u30f3\u30c8<\/div>\n

\u8f93\u5165”$ git pull –rebase origin master”\uff0c\u7136\u540e\u6267\u884cgit push\u5c31\u53ef\u4ee5\u4e86\uff01<\/p>\n

\u5c06\u5206\u652f\u6ce8\u518c\u5230\u8fdc\u7a0b\uff08+\u03b1\uff09<\/h2>\n

\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u8bbe\u7f6e\u4e3a\u9ed8\u8ba4\u63d0\u4ea4\u5230\u521b\u5efa\u7684\u5206\u652f\u3002<\/p>\n

2. \u547d\u4ee4\u6458\u8981<\/h1>\n

\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a2-x\u7684git\u5206\u652f<\/h2>\n

Git\u662f\u4e00\u79cd\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0c\u4f46\u8981\u638c\u63e1\u7248\u672c\u7ba1\u7406\u7684\u6838\u5fc3\uff0c\u9700\u8981\u7406\u89e3\u5206\u652f\u7684\u6982\u5ff5\u3002<\/p>\n

\u201c\u5206\u652f\u662f\u6307\u5411\u63d0\u4ea4\u7684\u6307\u9488\u3002\u4e5f\u5c31\u662f\u8bf4\uff0c\u7248\u672c\u63a7\u5236\u5c31\u662f\u901a\u8fc7\u8fd9\u4e2a\u6307\u9488\u6765\u8fdb\u884c\u7684\uff0c\u53ea\u9700\u5207\u6362\u6307\u9488\u5c31\u80fd\u5b8c\u6210\u7ba1\u7406\uff0c\u56e0\u6b64\u901f\u5ea6\u975e\u5e38\u5feb\uff01\uff08\u5728Git\u51fa\u73b0\u4e4b\u524d\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\u5927\u591a\u8bb0\u5f55\u53d8\u66f4\u5dee\u5f02\uff0c\u6240\u4ee5\u5f88\u91cd\uff09\u3002\u201d<\/p>\n

\u9ed8\u8ba4\u5206\u652f\u662fmaster\uff0c\u4f46\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u65b9\u5f0f\u521b\u5efa\u65b0\u5206\u652f\u3002<\/p>\n

$ <\/span>git branch <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n
$ git branch\u53ea\u4f1a\u663e\u793a\u5df2\u5b58\u5728\u7684\u5206\u652f
\n$ git branch -a\u4f1a\u663e\u793a\u5305\u62ec\u8fdc\u7a0b\u7684\u6240\u6709\u5206\u652f\u540d\u79f0
\n\u5206\u652f\u540d\u79f0\u66f4\u6539\uff1a\u4f7f\u7528$ git branch -m <\u5206\u652f\u540d\u79f0>\uff0c\u5c06\u5f53\u524d\u4f7f\u7528\u7684\u5206\u652f\u66f4\u6539\u4e3a\u8f93\u5165\u7684\u5206\u652f\u540d\u79f0\u3002\uff08m\u4ee3\u8868move\u7684\u9996\u5b57\u6bcd\uff09
\n\u5206\u652f\u5220\u9664\uff1a\u4f7f\u7528$ git branch -d <\u5206\u652f\u540d\u79f0>\uff0c\u53ef\u4ee5\u5220\u9664\u6307\u5b9a\u7684\u5206\u652f
\n\uff08\u5982\u679c\u60f3\u8981\u5f3a\u5236\u5220\u9664\uff0c\u53ef\u4ee5\u4f7f\u7528 -D \uff01\uff09<\/p>\n
\u5207\u6362\u52302-x\u5206\u652f\uff1agit checkout 2-x<\/h2>\n
\u4f7f\u7528git checkout\u547d\u4ee4\u53ef\u4ee5\u5b9e\u73b0\u5206\u652f\u7684\u5207\u6362\u3002\uff08\u5bf9\u4e8e\u591a\u4eba\u5f00\u53d1\u6765\u8bf4\uff0c\u5206\u652f\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\uff0c\u56e0\u6b64\u8bb0\u4f4fcheckout\u547d\u4ee4\u4e5f\u662f\u5fc5\u8981\u7684\u3002\uff09<\/p>\n
    \n
  • \n
      \u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u3057\u3066\u306f-b\u304c\u4fbf\u5229(b\u306f\u3001branch\u306e\u982d\u6587\u5b57)<\/ul>\n<\/li>\n<\/ul>\n
       <\/p>\n
        \n
      • \n
          \u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u52a0\u3048\u3066\u3001git checkout -b <\u30d6\u30e9\u30f3\u30c1\u540d>\u3068\u5165\u529b\u3059\u308b\u3068\u3001<\/ul>\n<\/li>\n<\/ul>\n
           <\/p>\n
            \u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u898f\u4f5c\u6210\u3057\u305f\u3046\u3048\u3067\u3001\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b!<\/ul>\n
            \u5408\u5e76 2-x \u66f4\u6539\u5386\u53f2\u7684 git merge<\/h2>\n
            \u6267\u884c\u5408\u5e76\u64cd\u4f5c\u65f6\uff0c\u5148\u8f6c\u5230\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\uff0c\u7136\u540e\u4f7f\u7528\u5408\u5e76\u547d\u4ee4\u6307\u5b9a\u8981\u5408\u5e76\u7684\u5206\u652f\u3002<\/p>\n
            $ <\/span>git merge <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n$ <\/span>git merge <\u30ea\u30e2\u30fc\u30c8\u540d>\/<\u30d6\u30e9\u30f3\u30c1\u540d>\r\n<\/code><\/pre>\n
            (\u5907\u5fd8\u5f55)\u5408\u5e76\u6709\u4e09\u79cd\u7c7b\u578b\u3002
            \n1. \u5feb\u901f\u524d\u8fdb\u5408\u5e76
            \n\u53ea\u9700\u8981\u5c06\u5206\u652f\u6307\u9488\u5411\u524d\u63a8\u8fdb\uff0c\u4ee5\u4fbf\u5408\u5e76\u6ca1\u6709\u5206\u53c9\u7684\u7ed3\u6784\u3002
            \n2. \u81ea\u52a8\u5408\u5e76
            \n\u7528\u4e8e\u5408\u5e76\u5206\u53c9\u7684\u5185\u5bb9\u3002
            \n3. \u51b2\u7a81\u5408\u5e76
            \n\u5728\u5408\u5e76\u5206\u53c9\u5185\u5bb9\u65f6\uff0c\u9047\u5230\u4fee\u590d\u4e86\u76f8\u540c\u4f4d\u7f6e\u7684\u95ee\u9898\u3002(\u7531\u4e8e\u65e0\u6cd5\u786e\u5b9a\u4f18\u5148\u9009\u62e9\u54ea\u4e2a\u4fee\u590d\u5185\u5bb9\uff0c\u9700\u8981\u51b3\u5b9a\u4f7f\u7528\u54ea\u4e2a\u4fee\u590d\u5185\u5bb9)<\/p>\n
            \u5f53\u53d1\u751f\u51b2\u7a81\u65f6\u2606\u91cd\u8981\u2606
            \n\u2780\u901a\u8fc7$ git merge\u786e\u8ba4\u53d1\u751f\u4e86\u51b2\u7a81
            \n\u2781\u901a\u8fc7$ git status\u786e\u8ba4\u51b2\u7a81\u53d1\u751f\u7684\u4f4d\u7f6e\uff0c\u5e76\u79fb\u52a8\u5230\u8be5\u4f4d\u7f6e
            \n\u2782\u786e\u8ba4\u51b2\u7a81\u7684\u90e8\u5206\uff08\u5220\u9664\u4e0d\u9700\u8981\u7684\u90e8\u5206\uff0c\u53ea\u4fdd\u7559\u6b63\u786e\u7684\u90e8\u5206\uff09
            \n\u5982\u679c\u53d1\u751f\u51b2\u7a81\uff0c\u60c5\u51b5\u4f1a\u5982\u4e0b\uff08\u5047\u8bbe\u8981\u5408\u5e76sub\u5206\u652f\uff09
            \n\u8fd9\u91cc\u6240\u8bf4\u7684HEAD\u5206\u652f\u662f\u6307\u81ea\u5df1\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\uff0c\u800c\u4e0d\u662f\u6307HEAD\u5206\u652f\u672c\u8eab\uff0c\u8bf7\u6ce8\u610f\uff01<\/p>\n
            <<<<<<\/span> HEAD<\/span>\r\n\/\/HEAD\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9<\/span>\r\n=========<\/span>\r\n\/\/sub\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9<\/span>\r\n>>>>><\/span> sub<\/span>\r\n<\/code><\/pre>\n
            \u5220\u9664\u51b2\u7a81\u7684\u90e8\u5206\uff08\u5305\u62ec<<<<< \u548c ====== ,>>>>>\uff09\uff0c\u7136\u540e\u5220\u9664\u4e0d\u9700\u8981\u4fdd\u7559\u4e3a\u7a0b\u5e8f\u7684\u51b2\u7a81\u5185\u5bb9\u3002<\/p>\n
            \u5982\u679c\u51fa\u73b0\u5176\u4ed6\u51b2\u7a81\uff0c\u540c\u6837\u8981\u89e3\u51b3\u5e76\u91cd\u65b0\u5408\u5e76\u3002<\/p>\n
            \u8bb0\u5f55\u53d8\u66f4\u5386\u53f2 – git log<\/h2>\n
            (24)191228: 191228\u5e7412\u670828\u65e5<\/p>\n
            \u65b9\u4fbf\u7684\u9009\u62e9<\/h3>\n
            (1) \u53ea\u663e\u793a\u6458\u8981\u7684\u4e00\u884c\u3002<\/p>\n
            $ <\/span>git log --oneline<\/span>\r\n<\/code><\/pre>\n
            (2) \u5f53\u60f3\u8981\u663e\u793a\u7279\u5b9a\u6587\u4ef6\u7684\u5dee\u5f02\u65f6<\/p>\n
            $ <\/span>git log -p<\/span> <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n
            \u663e\u793a\u6700\u8fd1\u7684\u63d0\u4ea4
            \n\u5728\u8fd9\u91cc\u8bbe\u7f6e\u8981\u663e\u793a\u7684\u5411\u540e\u7684\u63d0\u4ea4\u6570\u91cf<\/p>\n
            $ <\/span>git log -n<\/span> <\u30b3\u30df\u30c3\u30c8\u6570>\r\n<\/code><\/pre>\n
            \u5220\u9664\u6587\u4ef6 git rm 2-2<\/h2>\n
            rm \u662f\u300cremove\u300d\u7684\u7b80\u79f0\u3002
            \n(1) \u5220\u9664\u7279\u5b9a\u7684\u6587\u4ef6\u3002<\/p>\n
             $ <\/span>git rm<\/span> <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n
            \u5220\u9664\u7279\u5b9a\u76ee\u5f55\u65f6\uff0c\u9700\u8981\u6dfb\u52a0\u9009\u9879”-r”\u3002<\/p>\n
             $ <\/span>git rm<\/span> -r<\/span> <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n<\/code><\/pre>\n
            \u5982\u679c\u53ea\u60f3\u5220\u9664\u8fdc\u7a0b\u6570\u636e\uff0c\u4f7f\u7528\u6b64\u547d\u4ee4\u5373\u53ef\u3002\u800c\u5728(1)\u548c(2)\u4e2d\uff0c\u65e0\u8bba\u662f\u8fdc\u7a0b\u8fd8\u662f\u672c\u5730\uff0c\u90fd\u4f1a\u88ab\u5220\u9664\uff0c\u4f46\u5982\u679c\u5e0c\u671b\u5728\u5de5\u4f5c\u6811\uff08\u672c\u5730\uff09\u4e0a\u4fdd\u7559\u6587\u4ef6\uff0c\u5219\u53ef\u4ee5\u4f7f\u7528\u6b64\u547d\u4ee4\u3002<\/p>\n
             $ <\/span>git rm<\/span> --cached<\/span> <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n
            2.3 \u8fdc\u7a0b\u64cd\u4f5c git remote<\/h2>\n
            \u5728\u64cd\u4f5c\u8fdc\u7a0b\u5b58\u50a8\u5e93\u65f6\uff0c\u57fa\u672c\u4e0a\u4f7f\u7528remote\u547d\u4ee4\u5c31\u53ef\u4ee5\u4e86\u3002\u8bf7\u6ce8\u610f\uff0c\u8fdc\u7a0b\u5b58\u50a8\u5e93\u53ef\u4ee5\u6ce8\u518c\u591a\u4e2a\uff01\u5f53\u5355\u72ec\u4f7f\u7528git remote\u547d\u4ee4\u65f6\uff0c\u4f1a\u663e\u793a\u5df2\u6ce8\u518c\u7684\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684\u540d\u79f0\u3002<\/p>\n
            \n
            \u30b3\u30de\u30f3\u30c9\u5185\u5bb9-v\u5bfe\u5fdc\u3059\u308bURL\u3092\u8868\u793aadd <\u30ea\u30e2\u30fc\u30c8\u540d>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u65b0\u898f\u767b\u9332rename <\u65e7\u30ea\u30e2\u30fc\u30c8\u540d> <\u65b0\u30ea\u30e2\u30fc\u30c8\u540d>\u30ea\u30e2\u30fc\u30c8\u540d\u3092\u5909\u66f4rm <\u30ea\u30e2\u30fc\u30c8\u540d>\u7279\u5b9a\u306e\u30ea\u30e2\u30fc\u30c8\u3092\u524a\u9664<\/div>\n<\/div>\n
              <\u30ea\u30e2\u30fc\u30c8\u540d>\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306forigin<\/ul>\n
              fetch\u548cpull\u7684\u533a\u522b<\/h2>\n
              $ git pull \u548c $ git fetch <\u8fdc\u7a0b\u540d\u79f0>+$ git merge <\u8fdc\u7a0b\u540d\u79f0>\/<\u5206\u652f\u540d\u79f0> \u662f\u76f8\u540c\u7684\u64cd\u4f5c\u3002\u4ece\u8fd9\u6837\u770b\u6765\uff0cpull \u770b\u8d77\u6765\u66f4\u7b80\u5355\uff0c\u4f46\u662f\uff08\u672c\u5730\uff09\u5982\u679c\u6307\u5b9a\u7684\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5206\u652f\u88ab\u5408\u5e76\u5230\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u4e2d\uff0c\u4f1a\u5bfc\u81f4\u5185\u5bb9\u6df7\u6dc6\uff0c\u9700\u8981\u6ce8\u610f\uff01\u4e3a\u4e86\u907f\u514d\u6bcf\u6b21\u90fd\u9700\u8981\u786e\u8ba4\u8fd9\u6837\u7684\u9ebb\u70e6\uff0c\u4e5f\u53ef\u4ee5\u9009\u62e9\u4f7f\u7528 fetch \u7136\u540e\u5408\u5e76\uff01<\/p>\n
              \u5176\u4ed6\u6307\u4ee4<\/h2>\n
              \u30fb\u8bb0\u5f55\u6587\u4ef6\u79fb\u52a8
              \n$ git mv <\u6e90\u6587\u4ef6\u540d> <\u76ee\u6807\u6587\u4ef6\u540d><\/p>\n
              \u53ef\u4ee5\u540c\u65f6\u64cd\u4f5c $ mv\u3001$ git rm \u548c $ git add \u8fd9\u4e09\u4e2a\u547d\u4ee4\u3002<\/p>\n
              \u7ed9\u547d\u4ee4\u6dfb\u52a0\u522b\u540d\u3002<\/h1>\n
              \u62b1\u6b49\uff0c\u6211\u4e0d\u61c2\u4e2d\u6587\u3002\u8bf7\u95ee\u60a8\u9700\u8981\u4ec0\u4e48\u5e2e\u52a9\uff1f<\/p>\n
               $ <\/span>git config --global<\/span> alias.<\u30a8\u30a4\u30ea\u30a2\u30b9\u540d> <\u3082\u3068\u306e\u30b3\u30de\u30f3\u30c9\u540d>\r\n<\/code><\/pre>\n
               $ <\/span>git config --global<\/span> alias.co commit\r\n<\/code><\/pre>\n
              \u5728\u4e0a\u9762\u7684\u4f8b\u5b50\u4e2d\uff0c\u6211\u4eec\u7528\u522b\u540dco\u6765\u6ce8\u518ccommit\u547d\u4ee4\u3002
              \nconfig\u662f\u7528\u4e8e\u8fdb\u884c\u914d\u7f6e\u7684\u547d\u4ee4\u3002
              \n\u901a\u8fc7\u6dfb\u52a0–global\u9009\u9879\uff0c\u53ef\u4ee5\u5c06\u66f4\u6539\u5e94\u7528\u5230\u6574\u4e2a\u7535\u8111\u4e0a\uff08\u5982\u679c\u4e0d\u6dfb\u52a0\u8fd9\u4e2a\u9009\u9879\uff0c\u66f4\u6539\u53ea\u4f1a\u5728\u7279\u5b9a\u7684\u76ee\u5f55\u4e2d\u751f\u6548\uff09\u3002<\/p>\n
              \u6211\u4f7f\u7528\u7684\u522b\u540d\u5982\u4e0b\u6240\u793a\u3002<\/p>\n
              \n
              \u30a8\u30a4\u30ea\u30a2\u30b9\u540d\u5143\u306e\u30b3\u30de\u30f3\u30c9\u540d\u3000 \u3000cocommitststatusbrbranchdidiffchcheckout<\/div>\n<\/div>\n
              \u52a0\u03b1<\/h1>\n
              .gitignore\u6587\u4ef6<\/h2>\n
              \u4ee5\u4e0b\u8fd9\u4e9b\u6587\u4ef6\u5728Git\u4e2d\u4e0d\u9700\u8981\u5171\u4eab\uff1a
              \n– \u5305\u542b\u5bc6\u7801\u7684\u6587\u4ef6
              \n– \u5728\u56e2\u961f\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u4e0d\u9700\u8981\u5171\u4eab\u7684\u6587\u4ef6<\/p>\n
              \u901a\u8fc7\u5c06\u4e0d\u9700\u8981\u5171\u4eab\u7684\u6587\u4ef6\u6574\u7406\u5230.gitignore\u4e2d\uff0c\u53ef\u4ee5\u505c\u6b62\u5c06\u8fd9\u4e9b\u6587\u4ef6\u5171\u4eab\u5230Git\u4e2d\uff0c\u5b9e\u73b0\u4e0a\u8ff0\u63d0\u5230\u7684\u76ee\u7684\u3002<\/p>\n
              \u64a4\u9500\u66f4\u6539\u7684\u65b9\u6cd5<\/h2>\n
              \u5373\u4fbf\u8bf4\u8981\u53d6\u6d88\u66f4\u6539\uff0c\u6839\u636e\u4e0d\u540c\u7684\u9636\u6bb5\uff08\u8981\u53d6\u6d88\u54ea\u90e8\u5206\uff09\uff0c\u64cd\u4f5c\u4e5f\u4f1a\u6709\u6240\u4e0d\u540c\uff0c\u4f46\u603b\u7ed3\u8d77\u6765\u5c31\u50cf\u4e0b\u8868\u6240\u793a\u3002<\/p>\n
              \n
              \u7528\u9014\u30b3\u30de\u30f3\u30c9\u540d\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u4e0a\u306e\u53d6\u308a\u6d88\u3057$ git checkout –\u30b9\u30c6\u30fc\u30b8\u4e0a\u306e\u53d6\u308a\u6d88\u3057$ git reset HEAD\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u306e\u53d6\u308a\u6d88\u3057$ git commit –amend<\/div>\n<\/div>\n
              \u6ce8\u610f\uff1a\u53ea\u8981\u5c1a\u672a\u5c07\u4e0a\u4e00\u6b21\u63d0\u4ea4\u7684\u66f4\u6539\u63a8\u9001\u5230\u9060\u7a0b\u5132\u5b58\u5eab\uff0c\u5c31\u53ef\u4ee5\u9032\u884c\u300c\u53d6\u6d88\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u300d\u3002<\/p>\n
              \u5728\u6267\u884c\u4e0a\u8ff0\u547d\u4ee4\u540e\uff0c\u8f93\u5165\u7279\u5b9a\u7684\u201c\u6587\u4ef6\u540d\u201d\u6216\u201c\u76ee\u5f55\u540d\u201d\uff0c\u6216\u8005\u9009\u62e9\u5168\u90e8\u65f6\uff0c\u8f93\u5165\u201c\u3002\u201d\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
              \u547d\u4ee4\u901f\u67e5\u8868 \u8ba9\u6211\u4eec\u4ee5\u4f8b\u5b50\u6574\u7406\u4e00\u4e0b\u5e38\u7528\u547d\u4ee4\u7684\u547d\u4ee4\u540d\u79f0\u548c\u4f7f\u7528\u65b9\u6cd5\u3002 \u30b3\u30de\u30f3\u30c9\u4f7f\u3044\u65b9\u4f8b branch$ git br […]<\/p>\n","protected":false},"author":5,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37718","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981 - 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\/\u7531git\u521d\u5b66\u8005\u64b0\u5199\u7684git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\" \/>\n<meta property=\"og:description\" content=\"\u547d\u4ee4\u901f\u67e5\u8868 \u8ba9\u6211\u4eec\u4ee5\u4f8b\u5b50\u6574\u7406\u4e00\u4e0b\u5e38\u7528\u547d\u4ee4\u7684\u547d\u4ee4\u540d\u79f0\u548c\u4f7f\u7528\u65b9\u6cd5\u3002 \u30b3\u30de\u30f3\u30c9\u4f7f\u3044\u65b9\u4f8b branch$ git br […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u7531git\u521d\u5b66\u8005\u64b0\u5199\u7684git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-02-11T21:14:53+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T21:41:08+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2fe637434c4406c59dc2\/5-0.png\" \/>\n<meta name=\"author\" content=\"\u6e05, \u5b87\" \/>\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, \u5b87\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \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\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/\",\"name\":\"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-02-11T21:14:53+00:00\",\"dateModified\":\"2024-04-29T21:41:08+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\"}]},{\"@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\/1a6ecd3d914d22a5ac32791ffc1fbd8e\",\"name\":\"\u6e05, \u5b87\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u5b87\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981 - 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\/\u7531git\u521d\u5b66\u8005\u64b0\u5199\u7684git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\/","og_locale":"zh_CN","og_type":"article","og_title":"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981","og_description":"\u547d\u4ee4\u901f\u67e5\u8868 \u8ba9\u6211\u4eec\u4ee5\u4f8b\u5b50\u6574\u7406\u4e00\u4e0b\u5e38\u7528\u547d\u4ee4\u7684\u547d\u4ee4\u540d\u79f0\u548c\u4f7f\u7528\u65b9\u6cd5\u3002 \u30b3\u30de\u30f3\u30c9\u4f7f\u3044\u65b9\u4f8b branch$ git br […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u7531git\u521d\u5b66\u8005\u64b0\u5199\u7684git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-02-11T21:14:53+00:00","article_modified_time":"2024-04-29T21:41:08+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2fe637434c4406c59dc2\/5-0.png"}],"author":"\u6e05, \u5b87","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u5b87","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/","name":"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-02-11T21:14:53+00:00","dateModified":"2024-04-29T21:41:08+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u7531Git\u521d\u5b66\u8005\u64b0\u5199\u7684Git\u5165\u95e8\u548c\u529f\u80fd\u6458\u8981"}]},{"@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\/1a6ecd3d914d22a5ac32791ffc1fbd8e","name":"\u6e05, \u5b87","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","caption":"\u6e05, \u5b87"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%94%b1git%e5%88%9d%e5%ad%a6%e8%80%85%e6%92%b0%e5%86%99%e7%9a%84git%e5%85%a5%e9%97%a8%e5%92%8c%e5%8a%9f%e8%83%bd%e6%91%98%e8%a6%81\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37718","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\/5"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37718"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37718\/revisions"}],"predecessor-version":[{"id":90037,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37718\/revisions\/90037"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37718"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37718"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37718"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}