{"id":20369,"date":"2024-11-19T15:39:30","date_gmt":"2024-11-19T07:39:30","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20369\/"},"modified":"2024-11-19T15:39:30","modified_gmt":"2024-11-19T07:39:30","slug":"git%e6%92%a4%e5%9b%9e%e5%88%9a%e5%88%a0%e9%99%a4%e7%9a%84%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20369\/","title":{"rendered":"git\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f"},"content":{"rendered":"

\u5728\u65e5\u5e38\u4f7f\u7528git\u8fdb\u884c\u7248\u672c\u63a7\u5236\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u53ef\u80fd\u4f1a\u610f\u5916\u5220\u9664\u4e00\u4e2a\u5206\u652f\u3002\u4e0d\u8fc7\uff0c\u4e0d\u7528\u592a\u8fc7\u614c\u5f20\uff0cgit\u63d0\u4f9b\u4e86\u4e00\u4e2a\u529f\u80fd\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u3002<\/p>\n

\u4e00\u3001\u57fa\u672c\u6982\u5ff5<\/p>\n

\u5728\u6df1\u5165\u63a2\u8ba8\u5982\u4f55\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u4e4b\u524d\uff0c\u9996\u5148\u9700\u8981\u4e86\u89e3\u4e00\u4e0bgit\u4e2d\u7684\u4e00\u4e9b\u57fa\u672c\u6982\u5ff5\u548c\u672f\u8bed\u3002<\/p>\n

    \n
  1. \u5206\u652f\uff08branch\uff09\uff1a\u5206\u652f\u5c31\u662f\u4ee3\u7801\u4ed3\u5e93\u7684\u4e00\u4e2a\u526f\u672c\uff0c\u53ef\u4ee5\u5728\u8fd9\u4e2a\u526f\u672c\u4e2d\u4fee\u6539\u4ee3\u7801\u800c\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f\uff08master branch\uff09\u4e2d\u7684\u4ee3\u7801\u3002\u6211\u4eec\u53ef\u4ee5\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u6dfb\u52a0\u3001\u4fee\u6539\u4ee3\u7801\uff0c\u7136\u540e\u5728\u5f00\u53d1\u5b8c\u6210\u540e\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002<\/li>\n
  2. \u63d0\u4ea4\uff08commit\uff09\uff1a\u6bcf\u6b21\u6211\u4eec\u5bf9\u4ee3\u7801\u8fdb\u884c\u4fee\u6539\u540e\uff0cgit\u4f1a\u5c06\u6539\u52a8\u4fdd\u5b58\u4e3a\u4e00\u6b21\u63d0\u4ea4\u3002\u901a\u8fc7\u63d0\u4ea4\uff0c\u6211\u4eec\u53ef\u4ee5\u65b9\u4fbf\u5730\u67e5\u770b\u548c\u56de\u6eda\u4fee\u6539\u3002<\/li>\n
  3. \u5934\u6307\u9488\uff08head pointer\uff09\uff1a\u5934\u6307\u9488\u662f\u5f53\u524d\u5206\u652f\u6307\u5411\u7684\u63d0\u4ea4\u8282\u70b9\u3002\u5f53\u6211\u4eec\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u65f6\uff0cgit\u5c31\u4f1a\u81ea\u52a8\u66f4\u65b0\u5934\u6307\u9488\u6765\u6307\u5411\u6700\u65b0\u7684\u63d0\u4ea4\u3002<\/li>\n
  4. \u64a4\u9500\uff08revert\uff09\uff1a\u64a4\u9500\u662f\u6307\u5728\u5386\u53f2\u8bb0\u5f55\u4e2d\u53d6\u6d88\u5148\u524d\u7684\u63d0\u4ea4\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u64a4\u9500\u6765\u56de\u6eda\u4ee3\u7801\u4fee\u6539\u3002<\/li>\n<\/ol>\n

    \u4e8c\u3001\u5982\u4f55\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f<\/p>\n

    \u6709\u65f6\u5019\uff0c\u6211\u4eec\u5728\u4f7f\u7528git\u65f6\u4f1a\u610f\u5916\u5730\u5220\u9664\u4e00\u4e2a\u5206\u652f\u3002\u5982\u679c\u6211\u4eec\u53ea\u662f\u5355\u7eaf\u5730\u5220\u9664\u4e86\u5206\u652f\u800c\u6ca1\u6709\u505a\u4efb\u4f55\u5176\u4ed6\u64cd\u4f5c\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u8f7b\u677e\u64a4\u56de\u8fd9\u4e2a\u5220\u9664\u64cd\u4f5c\u3002<\/p>\n

      \n
    1. \u67e5\u627e\u5206\u652f<\/li>\n<\/ol>\n

      \u9996\u5148\uff0c\u9700\u8981\u77e5\u9053\u521a\u88ab\u5220\u9664\u7684\u5206\u652f\u7684\u540d\u79f0\u3002\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u627e\uff1a<\/p>\n

      $ git log --oneline --abbrev-commit --graph --decorate<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8fd9\u4e2a\u547d\u4ee4\u5c06\u663e\u793a\u4ee3\u7801\u7248\u672c\u5e93\u4e2d\u7684\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u3002\u5728\u8f93\u51fa\u7684\u5185\u5bb9\u4e2d\uff0c\u4f1a\u770b\u5230\u6bcf\u4e2a\u63d0\u4ea4\u7684hash\u503c\u3001\u63d0\u4ea4\u4fe1\u606f\u3001\u5206\u652f\u4fe1\u606f\u7b49\u3002<\/p>\n
        \n
      1. \u6062\u590d\u5206\u652f<\/li>\n<\/ol>\n
        \u73b0\u5728\u6211\u4eec\u6709\u4e86\u521a\u88ab\u5220\u9664\u7684\u5206\u652f\u540d\u79f0\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6062\u590d\u5206\u652f\uff1a<\/p>\n
        $ git branch <branch-name><commit-hash><\/commit-hash><\/branch-name><\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5176\u4e2d\uff0c”branch-name”\u662f\u9700\u8981\u6062\u590d\u7684\u5206\u652f\u540d\u79f0\uff0c”commit-hash”\u662f\u9700\u8981\u6062\u590d\u7684\u63d0\u4ea4\u8282\u70b9\u7684\u54c8\u5e0c\u503c\uff08\u4e5f\u53ef\u4ee5\u7528”HEAD”\u6765\u4ee3\u66ff\uff09\u3002<\/p>\n
        \u6062\u590d\u540e\uff0c\u60a8\u5c31\u53ef\u4ee5\u50cf\u5f80\u5e38\u4e00\u6837\u7ee7\u7eed\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\u3002<\/p>\n
        \u6ce8\u610f\uff1a\u5982\u679c\u4f60\u521a\u5220\u9664\u7684\u5206\u652f\u4e0d\u662f\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u90a3\u4e48\u5728\u6062\u590d\u5206\u652f\u4e4b\u524d\uff0c\u9700\u8981\u5c06HEAD\u6307\u9488\u79fb\u52a8\u5230\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u627e\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002<\/p>\n
        $ git reflog<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u8fd9\u4e2a\u547d\u4ee4\u5c06\u663e\u793agit\u5bf9\u4ee3\u7801\u7248\u672c\u5e93\u7684\u64cd\u4f5c\u5386\u53f2\uff0c\u53ef\u4ee5\u627e\u5230\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002<\/p>\n
        \u4e09\u3001\u603b\u7ed3<\/p>\n
        \u5728\u65e5\u5e38\u4f7f\u7528git\u65f6\uff0c\u610f\u5916\u5220\u9664\u5206\u652f\u5e76\u4e0d\u662f\u4ec0\u4e48\u5927\u95ee\u9898\u3002\u53ea\u8981\u6211\u4eec\u638c\u63e1\u4e86\u76f8\u5173\u7684\u64cd\u4f5c\uff0c\u53ef\u4ee5\u8f7b\u677e\u64a4\u9500\u5220\u9664\u64cd\u4f5c\u3002\u5728\u63a5\u4e0b\u6765\u7684\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u8bb0\u5f97\u4ed4\u7ec6\u5ba1\u67e5\u6bcf\u4e2a\u64cd\u4f5c\uff0c\u786e\u4fdd\u4e0d\u4f1a\u610f\u5916\u5220\u9664\u5206\u652f\u6216\u8005\u5176\u4ed6\u91cd\u8981\u7684Git\u8d44\u6e90\u3002<\/p>\n
        \u4ee5\u4e0a\u5c31\u662fgit\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
        \u5728\u65e5\u5e38\u4f7f\u7528git\u8fdb\u884c\u7248\u672c\u63a7\u5236\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u53ef\u80fd\u4f1a\u610f\u5916\u5220\u9664\u4e00\u4e2a\u5206\u652f\u3002\u4e0d\u8fc7\uff0c\u4e0d\u7528\u592a\u8fc7\u614c\u5f20\uff0cgit\u63d0\u4f9b\u4e86\u4e00\u4e2a\u529f\u80fd\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u3002 \u4e00\u3001\u57fa\u672c\u6982\u5ff5 \u5728\u6df1\u5165\u63a2\u8ba8\u5982\u4f55\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u4e4b\u524d\uff0c\u9996\u5148\u9700\u8981\u4e86\u89e3\u4e00\u4e0bgit\u4e2d\u7684\u4e00\u4e9b\u57fa\u672c\u6982\u5ff5\u548c\u672f\u8bed\u3002 \u5206\u652f\uff08branch\uff09\uff1a\u5206\u652f\u5c31\u662f\u4ee3\u7801\u4ed3\u5e93\u7684\u4e00\u4e2a\u526f\u672c\uff0c\u53ef\u4ee5\u5728\u8fd9\u4e2a\u526f\u672c\u4e2d\u4fee\u6539\u4ee3\u7801\u800c\u4e0d\u4f1a\u5f71\u54cd\u5230\u4e3b\u5206\u652f\uff08master branch\uff09\u4e2d\u7684\u4ee3\u7801\u3002\u6211\u4eec\u53ef\u4ee5\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u6dfb\u52a0\u3001\u4fee\u6539\u4ee3\u7801\uff0c\u7136\u540e\u5728\u5f00\u53d1\u5b8c\u6210\u540e\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002 \u63d0\u4ea4\uff08commit\uff09\uff1a\u6bcf\u6b21\u6211\u4eec\u5bf9\u4ee3\u7801\u8fdb\u884c\u4fee\u6539\u540e\uff0cgit\u4f1a\u5c06\u6539\u52a8\u4fdd\u5b58\u4e3a\u4e00\u6b21\u63d0\u4ea4\u3002\u901a\u8fc7\u63d0\u4ea4\uff0c\u6211\u4eec\u53ef\u4ee5\u65b9\u4fbf\u5730\u67e5\u770b\u548c\u56de\u6eda\u4fee\u6539\u3002 \u5934\u6307\u9488\uff08head pointer\uff09\uff1a\u5934\u6307\u9488\u662f\u5f53\u524d\u5206\u652f\u6307\u5411\u7684\u63d0\u4ea4\u8282\u70b9\u3002\u5f53\u6211\u4eec\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4ee3\u7801\u4fee\u6539\u65f6\uff0cgit\u5c31\u4f1a\u81ea\u52a8\u66f4\u65b0\u5934\u6307\u9488\u6765\u6307\u5411\u6700\u65b0\u7684\u63d0\u4ea4\u3002 \u64a4\u9500\uff08revert\uff09\uff1a\u64a4\u9500\u662f\u6307\u5728\u5386\u53f2\u8bb0\u5f55\u4e2d\u53d6\u6d88\u5148\u524d\u7684\u63d0\u4ea4\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u64a4\u9500\u6765\u56de\u6eda\u4ee3\u7801\u4fee\u6539\u3002 \u4e8c\u3001\u5982\u4f55\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f \u6709\u65f6\u5019\uff0c\u6211\u4eec\u5728\u4f7f\u7528git\u65f6\u4f1a\u610f\u5916\u5730\u5220\u9664\u4e00\u4e2a\u5206\u652f\u3002\u5982\u679c\u6211\u4eec\u53ea\u662f\u5355\u7eaf\u5730\u5220\u9664\u4e86\u5206\u652f\u800c\u6ca1\u6709\u505a\u4efb\u4f55\u5176\u4ed6\u64cd\u4f5c\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u8f7b\u677e\u64a4\u56de\u8fd9\u4e2a\u5220\u9664\u64cd\u4f5c\u3002 \u67e5\u627e\u5206\u652f \u9996\u5148\uff0c\u9700\u8981\u77e5\u9053\u521a\u88ab\u5220\u9664\u7684\u5206\u652f\u7684\u540d\u79f0\u3002\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u67e5\u627e\uff1a $ git log –oneline –abbrev-commit –graph –decorate \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u5c06\u663e\u793a\u4ee3\u7801\u7248\u672c\u5e93\u4e2d\u7684\u63d0\u4ea4\u5386\u53f2\u8bb0\u5f55\u3002\u5728\u8f93\u51fa\u7684\u5185\u5bb9\u4e2d\uff0c\u4f1a\u770b\u5230\u6bcf\u4e2a\u63d0\u4ea4\u7684hash\u503c\u3001\u63d0\u4ea4\u4fe1\u606f\u3001\u5206\u652f\u4fe1\u606f\u7b49\u3002 \u6062\u590d\u5206\u652f \u73b0\u5728\u6211\u4eec\u6709\u4e86\u521a\u88ab\u5220\u9664\u7684\u5206\u652f\u540d\u79f0\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6062\u590d\u5206\u652f\uff1a $ git branch <branch-name><commit-hash><\/commit-hash><\/branch-name> \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0c”branch-name”\u662f\u9700\u8981\u6062\u590d\u7684\u5206\u652f\u540d\u79f0\uff0c”commit-hash”\u662f\u9700\u8981\u6062\u590d\u7684\u63d0\u4ea4\u8282\u70b9\u7684\u54c8\u5e0c\u503c\uff08\u4e5f\u53ef\u4ee5\u7528”HEAD”\u6765\u4ee3\u66ff\uff09\u3002 \u6062\u590d\u540e\uff0c\u60a8\u5c31\u53ef\u4ee5\u50cf\u5f80\u5e38\u4e00\u6837\u7ee7\u7eed\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\u3002 \u6ce8\u610f\uff1a\u5982\u679c\u4f60\u521a\u5220\u9664\u7684\u5206\u652f\u4e0d\u662f\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u90a3\u4e48\u5728\u6062\u590d\u5206\u652f\u4e4b\u524d\uff0c\u9700\u8981\u5c06HEAD\u6307\u9488\u79fb\u52a8\u5230\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u627e\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002 $ git reflog \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4e2a\u547d\u4ee4\u5c06\u663e\u793agit\u5bf9\u4ee3\u7801\u7248\u672c\u5e93\u7684\u64cd\u4f5c\u5386\u53f2\uff0c\u53ef\u4ee5\u627e\u5230\u6b63\u786e\u7684\u63d0\u4ea4\u8282\u70b9\u3002 \u4e09\u3001\u603b\u7ed3 \u5728\u65e5\u5e38\u4f7f\u7528git\u65f6\uff0c\u610f\u5916\u5220\u9664\u5206\u652f\u5e76\u4e0d\u662f\u4ec0\u4e48\u5927\u95ee\u9898\u3002\u53ea\u8981\u6211\u4eec\u638c\u63e1\u4e86\u76f8\u5173\u7684\u64cd\u4f5c\uff0c\u53ef\u4ee5\u8f7b\u677e\u64a4\u9500\u5220\u9664\u64cd\u4f5c\u3002\u5728\u63a5\u4e0b\u6765\u7684\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u8bb0\u5f97\u4ed4\u7ec6\u5ba1\u67e5\u6bcf\u4e2a\u64cd\u4f5c\uff0c\u786e\u4fdd\u4e0d\u4f1a\u610f\u5916\u5220\u9664\u5206\u652f\u6216\u8005\u5176\u4ed6\u91cd\u8981\u7684Git\u8d44\u6e90\u3002 \u4ee5\u4e0a\u5c31\u662fgit\u64a4\u56de\u521a\u5220\u9664\u7684\u5206\u652f\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20369","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20369","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20369"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20369\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20369"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20369"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20369"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}