{"id":37101,"date":"2023-06-25T08:07:35","date_gmt":"2024-02-01T17:43:29","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/"},"modified":"2024-04-30T10:35:31","modified_gmt":"2024-04-30T02:35:31","slug":"%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/","title":{"rendered":"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406"},"content":{"rendered":"<h1>\u9996\u5148<\/h1>\n<p>2023\u5e74Git\u5723\u8bde\u65e5\u5386\u7684\u7b2c\u4e09\u5929\u5e16\u5b50\u3002\u8bf7\u591a\u591a\u5173\u7167\u3002<br \/>\n\u6211\u8ba4\u4e3a\u5728\u4e0a\u6b21\u548c\u524d\u6b21\u7684\u5e16\u5b50\u4e2d\uff0c\u5df2\u7ecf\u80fd\u591f\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e86\u3002<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git init<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git add<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git commit<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git branch<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">git checkout<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">git merge<\/ul>\n<p>\u6211\u5bf9\u5185\u90e8\u7684\u64cd\u4f5c\u611f\u5230\u597d\u5947\uff0c\u6240\u4ee5\u8fd9\u6b21\u6211\u60f3\u89c2\u5bdf\u4e00\u4e0b\u6267\u884c\u4e0a\u8ff0\u547d\u4ee4\u65f6.git\u6587\u4ef6\u5939\u5185\u90e8\u7684\u53d8\u5316\u3002<\/p>\n<h1>\u5b8c\u6210\u7684\u4efb\u52a1<\/h1>\n<p>\u6211\u4eec\u5c06\u6309\u7167\u4e0b\u9762\u7684\u611f\u89c9\u7ee7\u7eed\u8fdb\u884c\u3002<\/p>\n<p>\u521b\u5efa\u5b58\u50a8\u5e93(A)<br \/>\n\u2b07<br \/>\n\u5728\u5b58\u50a8\u5e93(A)\u7684.git\u6587\u4ef6\u5939\u4e2d\u8fd0\u884cgit init\u6765\u521b\u5efa\u7ba1\u7406.git\u7684\u5b58\u50a8\u5e93(B)<br \/>\n\u2b07<br \/>\n\u5728\u5b58\u50a8\u5e93(A)\u5904\u8fd0\u884cGit\u547d\u4ee4\u4ee5\u89c2\u5bdf\u5b58\u50a8\u5e93(B)\u4e2d\u7684\u5dee\u5f02<\/p>\n<p>\u7531\u4e8e\u6211\u4f7f\u7528\u4e86\u4e24\u4e2aGit\u4ed3\u5e93\uff0c\u6240\u4ee5\u53ef\u80fd\u4f1a\u6709\u4e00\u4e9b\u8f6c\u6362\u4e0d\u592a\u660e\u663e\u7684\u5730\u65b9\uff0c\u8bf7\u591a\u5305\u6db5\u3002<\/p>\n<h1>\u51c6\u5907<\/h1>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">\u300cgit\/sample2\u300d\u30d5\u30a9\u30eb\u30c0\u3092\u7528\u610f\u3002<\/ul>\n<\/li>\n<\/ul>\n<p>&nbsp;<\/p>\n<ul class=\"post-ul\">\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u3067Git\u306e\u5404\u30b3\u30de\u30f3\u30c9\u3092\u6253\u3063\u3066.git\u306e\u4e2d\u8eab\u3092\u89b3\u5bdf\u3057\u3066\u3044\u304d\u307e\u3059\u3002<\/ul>\n<h1>\u521d\u59cb\u5316 Git<\/h1>\n<p>\u6267\u884cgit init\u547d\u4ee4\u6765\u521b\u5efa\u5b58\u50a8\u5e93(A)\u7684.git\u6587\u4ef6\u5939\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">init<\/span>\r\n<span class=\"kd\">Initialized<\/span> <span class=\"kd\">empty<\/span> <span class=\"kd\">Git<\/span> <span class=\"kd\">repository<\/span> <span class=\"k\">in<\/span> \u30d5\u30a9\u30eb\u30c0\u540d\r\n<\/code><\/pre>\n<p>.git\u30d5\u30a9\u30eb\u30c0\u306e\u69cb\u6210<\/p>\n<pre class=\"post-pre\"><code>.git\r\n\u2502  config\r\n\u2502  description\r\n\u2502  HEAD\r\n\u2502\r\n\u251c\u2500hooks\r\n\u2502      applypatch-msg.sample\r\n\u2502      commit-msg.sample\r\n\u2502      fsmonitor-watchman.sample\r\n\u2502      post-update.sample\r\n\u2502      pre-applypatch.sample\r\n\u2502      pre-commit.sample\r\n\u2502      pre-push.sample\r\n\u2502      pre-rebase.sample\r\n\u2502      pre-receive.sample\r\n\u2502      prepare-commit-msg.sample\r\n\u2502      update.sample\r\n\u2502\r\n\u251c\u2500info\r\n\u2502      exclude\r\n\u2502\r\n\u251c\u2500objects\r\n\u2502  \u251c\u2500info\r\n\u2502  \u2514\u2500pack\r\n\u2514\u2500refs\r\n    \u251c\u2500heads\r\n    \u2514\u2500tags\r\n<\/code><\/pre>\n<p>\u5728.git\u6587\u4ef6\u5939\u4e2d\u4f7f\u7528git init\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u4ed3\u5e93(B)\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">GIT_DIR<\/span><span class=\"err\">!<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">init<\/span>\r\n<span class=\"kd\">Initialized<\/span> <span class=\"kd\">empty<\/span> <span class=\"kd\">Git<\/span> <span class=\"kd\">repository<\/span> <span class=\"k\">in<\/span> \u30d5\u30a9\u30eb\u30c0\u540d\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n\r\n<span class=\"kd\">No<\/span> <span class=\"kd\">commits<\/span> <span class=\"kd\">yet<\/span>\r\n\r\n<span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">HEAD<\/span>\r\n        <span class=\"kd\">config<\/span>\r\n        <span class=\"kd\">description<\/span>\r\n        <span class=\"kd\">hooks<\/span>\/\r\n        <span class=\"kd\">info<\/span>\/\r\n\r\n<span class=\"kd\">nothing<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"kd\">but<\/span> <span class=\"kd\">untracked<\/span> <span class=\"kd\">files<\/span> <span class=\"kd\">present<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">track<\/span><span class=\"o\">)<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"git init\u5f8c\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"o\">(<\/span><span class=\"kd\">root<\/span><span class=\"na\">-commit<\/span><span class=\"o\">)<\/span> <span class=\"kd\">a47036c<\/span><span class=\"o\">]<\/span> <span class=\"kd\">git<\/span> <span class=\"kd\">init<\/span>\u5f8c\r\n<\/code><\/pre>\n<h1>\u4f7f\u7528git add\u547d\u4ee4<\/h1>\n<p>\u5728\uff08A\uff09\u4ed3\u5e93\u4e2d\u521b\u5efa\u4e00\u4e2a\u540d\u4e3a\u201csample.txt\u201d\u7684\u6587\u4ef6\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"hello world\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">ls<\/span>\r\n<span class=\"kd\">sample<\/span>.txt\r\n<\/code><\/pre>\n<p>\u521b\u5efa\u6587\u4ef6\u540e\u7684.git\u6587\u4ef6\u5939\u6ca1\u6709\u4efb\u4f55\u7279\u6b8a\u53d8\u5316\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">nothing<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span><span class=\"o\">,<\/span> <span class=\"kd\">working<\/span> <span class=\"nb\">tree<\/span> <span class=\"kd\">clean<\/span>\r\n<\/code><\/pre>\n<p>\u6211\u5c1d\u8bd5\u6267\u884cgit add\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n<\/code><\/pre>\n<p>\u5728\u4f7f\u7528 git add \u4e4b\u540e\u7684 .git \u6587\u4ef6\u5939\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">objects<\/span>\/\r\n\r\n<span class=\"kd\">nothing<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"kd\">but<\/span> <span class=\"kd\">untracked<\/span> <span class=\"kd\">files<\/span> <span class=\"kd\">present<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">track<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u54e6\uff0c\u6709\u4e86\u53d8\u5316\u5462\u3002<\/p>\n<p>.git\u30d5\u30a9\u30eb\u30c0\u306e\u73fe\u5728\u306e\u72b6\u6cc1<\/p>\n<pre class=\"post-pre\"><code>C:.\r\n\u2502  config\r\n\u2502  description\r\n\u2502  HEAD\r\n\u2502  index\u3000\u2190\u2190\u2190\u65b0\u898f\r\n\u2502\r\n\u251c\u2500hooks\r\n\u2502      applypatch-msg.sample\r\n\u2502      commit-msg.sample\r\n\u2502      fsmonitor-watchman.sample\r\n\u2502      post-update.sample\r\n\u2502      pre-applypatch.sample\r\n\u2502      pre-commit.sample\r\n\u2502      pre-push.sample\r\n\u2502      pre-rebase.sample\r\n\u2502      pre-receive.sample\r\n\u2502      prepare-commit-msg.sample\r\n\u2502      update.sample\r\n\u2502\r\n\u251c\u2500info\r\n\u2502      exclude\r\n\u2502\r\n\u251c\u2500objects\r\n\u2502  \u251c\u25003b\u3000\u2190\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      18e512dba79e4c8300dd08aeb37f8e728b8dad\r\n\u2502  \u2502\r\n\u2502  \u251c\u2500info\r\n\u2502  \u2514\u2500pack\r\n\u2514\u2500refs\r\n    \u251c\u2500heads\r\n    \u2514\u2500tags\r\n<\/code><\/pre>\n<p>\u4e0e.git\u6587\u4ef6\u5939\u76f8\u6bd4\uff0c\u53ef\u4ee5\u770b\u51fa\u5728git init\u540e\uff0c\u65b0\u521b\u5efa\u4e86index\u548cobjects\u4e0b\u76843b\/18e512&#8230;\u3002\u7531\u4e8eindex\u662f\u4e00\u4e2a\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u5f88\u96be\u9a8c\u8bc1\u5dee\u5f02\uff0c\u56e0\u6b64\u6700\u540e\u5c06\u5728\u9644\u6ce8\u4e2d\u8fdb\u884c\u89e3\u91ca\u3002<\/p>\n<p>\u8ba9\u6211\u4eec\u6765\u770b\u4e00\u770b\u5bf9\u8c61\u7684\u5185\u5bb9\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">3<\/span><span class=\"kd\">b18e512dba79e4c8300dd08aeb37f8e728b8dad<\/span>\r\n<span class=\"kd\">hello<\/span> <span class=\"kd\">world<\/span>\r\n<\/code><\/pre>\n<p>\u5728Git\u6dfb\u52a0\u65f6\u4f1a\u751f\u6210\u4e00\u4e2ablob\u5bf9\u8c61\u3002<br \/>\n\u6211\u53ea\u77e5\u9053\u8fd9\u4e9b\u3002<\/p>\n<h1>\u63d0\u4ea4\u4ee3\u7801<\/h1>\n<p>\u6211\u63a5\u4e0b\u6765\u5c1d\u8bd5\u63d0\u4ea4\u4e00\u6b21\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"first commit\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"o\">(<\/span><span class=\"kd\">root<\/span><span class=\"na\">-commit<\/span><span class=\"o\">)<\/span> <span class=\"m\">411124<\/span><span class=\"kd\">e<\/span><span class=\"o\">]<\/span> <span class=\"kd\">first<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<p>\u6211\u4f1a\u5c1d\u8bd5\u5728.git\u4e2d\u6267\u884cgit status\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n\r\n<span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">COMMIT_EDITMSG<\/span>\r\n        <span class=\"kd\">logs<\/span>\/\r\n        <span class=\"kd\">objects<\/span>\/02\/\r\n        <span class=\"kd\">objects<\/span>\/88\/\r\n        <span class=\"kd\">refs<\/span>\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>.git\u6587\u4ef6\u5939\u5185\u5bb9\u6709\u6240\u6539\u53d8\u3002\u6307\u7684\u662f\u6574\u4e2a.git\u6587\u4ef6\u5939\u3002<\/p>\n<pre class=\"post-pre\"><code>.git\r\n\u2502  COMMIT_EDITMSG\u3000\u2190\u2190\u65b0\u898f\r\n\u2502  config\r\n\u2502  description\r\n\u2502  HEAD\r\n\u2502  index\u3000\u2190\u2190\u66f4\u65b0\r\n\u2502\r\n\u251c\u2500hooks\r\n\u2502      applypatch-msg.sample\r\n\u2502      commit-msg.sample\r\n\u2502      fsmonitor-watchman.sample\r\n\u2502      post-update.sample\r\n\u2502      pre-applypatch.sample\r\n\u2502      pre-commit.sample\r\n\u2502      pre-push.sample\r\n\u2502      pre-rebase.sample\r\n\u2502      pre-receive.sample\r\n\u2502      prepare-commit-msg.sample\r\n\u2502      update.sample\r\n\u2502\r\n\u251c\u2500info\r\n\u2502      exclude\r\n\u2502\r\n\u251c\u2500logs\u3000\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502  HEAD\r\n\u2502  \u2502\r\n\u2502  \u2514\u2500refs\r\n\u2502      \u2514\u2500heads\r\n\u2502              master\r\n\u2502\r\n\u251c\u2500objects\r\n\u2502  \u251c\u250002\u3000\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      3bd50171db535beab09fed56bd5a9281b01555\r\n\u2502  \u2502\r\n\u2502  \u251c\u25003b\r\n\u2502  \u2502      18e512dba79e4c8300dd08aeb37f8e728b8dad\r\n\u2502  \u2502\r\n\u2502  \u251c\u250088\u3000\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      ccc6b27fbf7beb37e2b2dadceef08ed83a5716\r\n\u2502  \u2502\r\n\u2502  \u251c\u2500info\r\n\u2502  \u2514\u2500pack\r\n\u2514\u2500refs\r\n    \u251c\u2500heads\r\n    \u2502      master\u3000\u2190\u2190\u65b0\u898f\r\n    \u2502\r\n    \u2514\u2500tags\r\n<\/code><\/pre>\n<p>\u6211\u4eec\u9010\u4e2a\u6765\u770b\u4e00\u4e0b\u3002<\/p>\n<p>\u9996\u5148\uff0c\u7531\u4e8e\u751f\u6210\u4e86\u4e24\u4e2a\u5bf9\u8c61\uff0c\u6240\u4ee5\u6211\u4f1a\u67e5\u770b\u5b83\u4eec\u7684\u5185\u5bb9\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">88<\/span><span class=\"kd\">ccc6b27fbf7beb37e2b2dadceef08ed83a5716<\/span>\r\n<span class=\"m\">100644<\/span> <span class=\"kd\">blob<\/span> <span class=\"m\">3<\/span><span class=\"kd\">b18e512dba79e4c8300dd08aeb37f8e728b8dad<\/span>    <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">023<\/span><span class=\"kd\">bd50171db535beab09fed56bd5a9281b01555<\/span>\r\n<span class=\"nb\">tree<\/span> <span class=\"m\">88<\/span><span class=\"kd\">ccc6b27fbf7beb37e2b2dadceef08ed83a5716<\/span>\r\n<span class=\"kd\">author<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699592736<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n<span class=\"kd\">committer<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699592736<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n\r\n<span class=\"kd\">first<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<p>\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u6811\u5bf9\u8c61\u548c\u63d0\u4ea4\u5bf9\u8c61\u5df2\u7ecf\u751f\u6210\u3002\u6211\u4eec\u8fd8\u53ef\u4ee5\u770b\u5230\u6811\u5bf9\u8c61\u5177\u6709\u5bf9Blob\u7684\u5f15\u7528\uff0c\u800c\u63d0\u4ea4\u5bf9\u8c61\u5177\u6709\u5bf9\u6811\u5bf9\u8c61\u7684\u5f15\u7528\u3002<\/p>\n<p>\u63a5\u4e0b\u6765\u6211\u4eec\u770b\u4e00\u4e0bCOMMIT_EDITMSG\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat COMMIT_EDITMSG\r\nfirst commit\r\n<\/code><\/pre>\n<p>\u8fd9\u662f\u4e4b\u524d\u63d0\u4ea4\u7684\u63d0\u4ea4\u6d88\u606f\u5417\uff1f\u76ee\u524d\u4e3a\u6b62\uff0c\u6211\u4e0d\u77e5\u9053\u66f4\u591a\u7684\u4fe1\u606f\u3002<br \/>\n\u6211\u4eec\u7a0d\u540e\u518d\u8bd5\u4e00\u6b21\u63d0\u4ea4\uff0c\u770b\u770b\u662f\u5426\u4f1a\u6709\u53d8\u5316\u3002<\/p>\n<p>\u8ba9\u6211\u4eec\u63a5\u7740\u770b\u770brefs\/heads\/master\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat refs\/heads\/master\r\n023bd50171db535beab09fed56bd5a9281b01555\r\n<\/code><\/pre>\n<p>\u8fd9\u4e2a\u662f\u6307\u5728objects\u6587\u4ef6\u5939\u4e2d\u65b0\u521b\u5efa\u7684\u63d0\u4ea4\u5bf9\u8c61\u7684\u54c8\u5e0c\u503c\u3002<\/p>\n<p>\u6700\u540e\u662flogs\/HEAD\u548clogs\/refs\/master\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat logs\/HEAD\r\n0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900  commit (initial): first commit\r\n\r\n$ cat logs\/refs\/heads\/master\r\n0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900  commit (initial): first commit\r\n<\/code><\/pre>\n<p>\u65e5\u5fd7\u5c31\u50cf\u5b83\u7684\u540d\u5b57\u4e00\u6837\uff0c\u7528\u6765\u5b58\u50a8\u8bb0\u5f55\u3002\u6bcf\u4e2a\u65e5\u5fd7\u90fd\u8bb0\u5f55\u4e86HEAD\u4ece\u54ea\u4e2a\u63d0\u4ea4\u5230\u54ea\u4e2a\u63d0\u4ea4\u79fb\u52a8\uff0c\u4ee5\u53ca\u5206\u652f\u4ece\u54ea\u4e2a\u63d0\u4ea4\u5230\u54ea\u4e2a\u63d0\u4ea4\u79fb\u52a8\u3002\u7531\u4e8e\u8fd9\u6b21\u6ca1\u6709\u5bf9\u5206\u652f\u8fdb\u884c\u7279\u522b\u64cd\u4f5c\uff0c\u6240\u4ee5\u770b\u8d77\u6765\u5185\u5bb9\u662f\u76f8\u540c\u7684\u3002<\/p>\n<p>\u56e0\u4e3a\u6211\u5728\u610fCOMMIT_EDITMSG\u7684\u5904\u7406\u65b9\u5f0f\uff0c\u6240\u4ee5\u8ba9\u6211\u4eec\u518d\u6b21\u8fdb\u884c\u63d0\u4ea4\u5427\u3002\u968f\u610f\u66f4\u65b0&#8221;sample.txt&#8221;\u5e76\u91cd\u65b0\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"hello\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"second commit\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"m\">6<\/span><span class=\"kd\">cf4fd0<\/span><span class=\"o\">]<\/span> <span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n <span class=\"m\">1<\/span> <span class=\"kd\">file<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">insertion<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n<\/code><\/pre>\n<p>\u5bf9\u4e8e.git\u4f1a\u600e\u4e48\u6837\u5462\uff1f\u6211\u8bd5\u8bd5\u770bgit status\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">COMMIT_EDITMSG<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/refs\/heads\/master\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">refs<\/span><span class=\"na\">\/heads\/master\r\n\r\n<\/span><span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">objects<\/span>\/6c\/\r\n        <span class=\"kd\">objects<\/span><span class=\"na\">\/ce<\/span>\/\r\n        <span class=\"kd\">objects<\/span><span class=\"na\">\/e<\/span><span class=\"m\">3<\/span>\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u5148\u6765\u770b\u770b\u6211\u4eec\u60f3\u770b\u7684COMMIT_EDITMSG\u6587\u4ef6\u7684\u5dee\u5f02\u3002<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff COMMIT_EDITMSG\r\n<span class=\"gh\">diff --git a\/COMMIT_EDITMSG b\/COMMIT_EDITMSG\r\nindex 44e4d81..2ff0cc0 100644\r\n<\/span><span class=\"gd\">--- a\/COMMIT_EDITMSG\r\n<\/span><span class=\"gi\">+++ b\/COMMIT_EDITMSG\r\n<\/span><span class=\"p\">@@ -1 +1 @@<\/span>\r\n<span class=\"gd\">-first commit\r\n<\/span><span class=\"gi\">+second commit\r\n<\/span><\/code><\/pre>\n<p>\u770b\u8d77\u6765\u597d\u50cf\u662f\u4fdd\u5b58\u7740\u524d\u4e00\u4e2a\u63d0\u4ea4\u4fe1\u606f\u7684\u6587\u4ef6\u3002<br \/>\n\u6211\u60f3\u4f60\u5df2\u7ecf\u731c\u5230\u4e86\uff0c\u6211\u4eec\u662f\u5426\u4e5f\u5e94\u8be5\u67e5\u770b\u5176\u4ed6\u6587\u4ef6\u5462\uff1f<br \/>\n\u8fd9\u662f\u5f53\u524d\u7684.git\u6587\u4ef6\u5939\u7684\u60c5\u51b5\u3002<\/p>\n<pre class=\"post-pre\"><code>.git\r\n\u2502  COMMIT_EDITMSG\u3000\u2190\u2190\u2190\u66f4\u65b0\r\n\u2502  config\r\n\u2502  description\r\n\u2502  HEAD\r\n\u2502  index\u3000\u2190\u2190\u2190\u66f4\u65b0\r\n\u2502\r\n\u251c\u2500hooks\r\n\u2502      applypatch-msg.sample\r\n\u2502      commit-msg.sample\r\n\u2502      fsmonitor-watchman.sample\r\n\u2502      post-update.sample\r\n\u2502      pre-applypatch.sample\r\n\u2502      pre-commit.sample\r\n\u2502      pre-push.sample\r\n\u2502      pre-rebase.sample\r\n\u2502      pre-receive.sample\r\n\u2502      prepare-commit-msg.sample\r\n\u2502      update.sample\r\n\u2502\r\n\u251c\u2500info\r\n\u2502      exclude\r\n\u2502\r\n\u251c\u2500logs\r\n\u2502  \u2502  HEAD\u3000\u2190\u2190\u2190\u66f4\u65b0\r\n\u2502  \u2502\r\n\u2502  \u2514\u2500refs\r\n\u2502      \u2514\u2500heads\r\n\u2502              master\u3000\u2190\u2190\u2190\u66f4\u65b0\r\n\u2502\r\n\u251c\u2500objects\r\n\u2502  \u251c\u250002\r\n\u2502  \u2502      3bd50171db535beab09fed56bd5a9281b01555\r\n\u2502  \u2502\r\n\u2502  \u251c\u25003b\r\n\u2502  \u2502      18e512dba79e4c8300dd08aeb37f8e728b8dad\r\n\u2502  \u2502\r\n\u2502  \u251c\u25006c\u3000\u2190\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      f4fd07bd3d1f982045f50fae9dc070d6967f36\r\n\u2502  \u2502\r\n\u2502  \u251c\u250088\r\n\u2502  \u2502      ccc6b27fbf7beb37e2b2dadceef08ed83a5716\r\n\u2502  \u2502\r\n\u2502  \u251c\u2500ce\u3000\u2190\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      013625030ba8dba906f756967f9e9ca394464a\r\n\u2502  \u2502\r\n\u2502  \u251c\u2500e3\u3000\u2190\u2190\u2190\u65b0\u898f\r\n\u2502  \u2502      d14d7340059b5852f32f29574e98ff73eb3c47\r\n\u2502  \u2502\r\n\u2502  \u251c\u2500info\r\n\u2502  \u2514\u2500pack\r\n\u2514\u2500refs\r\n    \u251c\u2500heads\r\n    \u2502      master\r\n    \u2502\r\n    \u2514\u2500tags\r\n<\/code><\/pre>\n<p>objects\u30d5\u30a9\u30eb\u30c0\u914d\u4e0b\u306e\u65b0\u898f\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\uff13\u3064<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"kd\">ce013625030ba8dba906f756967f9e9ca394464a<\/span>\r\n<span class=\"kd\">hello<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"kd\">e3d14d7340059b5852f32f29574e98ff73eb3c47<\/span>\r\n<span class=\"m\">100644<\/span> <span class=\"kd\">blob<\/span> <span class=\"kd\">ce013625030ba8dba906f756967f9e9ca394464a<\/span>    <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">6<\/span><span class=\"kd\">cf4fd07bd3d1f982045f50fae9dc070d6967f36<\/span>\r\n<span class=\"nb\">tree<\/span> <span class=\"kd\">e3d14d7340059b5852f32f29574e98ff73eb3c47<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"m\">023<\/span><span class=\"kd\">bd50171db535beab09fed56bd5a9281b01555<\/span>\r\n<span class=\"kd\">author<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699594574<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n<span class=\"kd\">committer<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699594574<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n\r\n<span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<p>\u8fd9\u662f\u5173\u4e8eBlob\u3001Tree\u548cCommit\u5bf9\u8c61\u7684\u5185\u5bb9\u3002<\/p>\n<p>logs\u30d5\u30a9\u30eb\u30c0\u914d\u4e0b\u306e\u66f4\u65b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff logs\/\r\n<span class=\"gh\">diff --git a\/logs\/HEAD b\/logs\/HEAD\r\nindex 8783cde..58d6c1d 100644\r\n<\/span><span class=\"gd\">--- a\/logs\/HEAD\r\n<\/span><span class=\"gi\">+++ b\/logs\/HEAD\r\n<\/span><span class=\"p\">@@ -1,2 +1,2 @@<\/span>\r\n 0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900 commit (initial): first commit\r\n<span class=\"gi\">+023bd50171db535beab09fed56bd5a9281b01555 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699594574 +0900 commit: second commit\r\n<\/span><span class=\"gh\">diff --git a\/logs\/refs\/heads\/master b\/logs\/refs\/heads\/master\r\nindex 8783cde..58d6c1d 100644\r\n<\/span><span class=\"gd\">--- a\/logs\/refs\/heads\/master\r\n<\/span><span class=\"gi\">+++ b\/logs\/refs\/heads\/master\r\n<\/span><span class=\"p\">@@ -1,2 +1,2 @@<\/span>\r\n 0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900 commit (initial): first commit\r\n<span class=\"gi\">+023bd50171db535beab09fed56bd5a9281b01555 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699594574 +0900 commit: second commit\r\n<\/span><\/code><\/pre>\n<p>\u65e5\u5fd7\u662f\u8fd9\u6837\u5199\u7684\u3002<\/p>\n<p>refs\u914d\u4e0b\u306e\u66f4\u65b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff refs\/\r\n<span class=\"gh\">diff --git a\/refs\/heads\/master b\/refs\/heads\/master\r\nindex f1bb341..ed3d53b 100644\r\n<\/span><span class=\"gd\">--- a\/refs\/heads\/master\r\n<\/span><span class=\"gi\">+++ b\/refs\/heads\/master\r\n<\/span><span class=\"p\">@@ -1 +1 @@<\/span>\r\n<span class=\"gd\">-023bd50171db535beab09fed56bd5a9281b01555\r\n<\/span><span class=\"gi\">+6cf4fd07bd3d1f982045f50fae9dc070d6967f36\r\n<\/span><\/code><\/pre>\n<p>\u4e3b\u5206\u652f\u7684\u63d0\u4ea4\u5df2\u7ecf\u79fb\u52a8\u4e86\u3002<\/p>\n<h1>\u5206\u652f<\/h1>\n<p>\u63a5\u4e0b\u6765\uff0c\u8ba9\u6211\u4eec\u4f7f\u7528git branch\u547d\u4ee4\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u3002<br \/>\n\u6211\u4eec\u5c06\u521b\u5efa\u53e6\u4e00\u4e2a\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">another<\/span>\r\n<\/code><\/pre>\n<p>.git\u6587\u4ef6\u5939\u91cc\u9762\u53d1\u751f\u4e86\u4ec0\u4e48\uff1f<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">logs<\/span><span class=\"na\">\/refs\/heads\/another\r\n        <\/span><span class=\"kd\">refs<\/span><span class=\"na\">\/heads\/another\r\n\r\n<\/span><span class=\"kd\">nothing<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"kd\">but<\/span> <span class=\"kd\">untracked<\/span> <span class=\"kd\">files<\/span> <span class=\"kd\">present<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">track<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u6211\u4eec\u505a\u4e86\u4e24\u4e2a\u6587\u4ef6\uff0c\u8bf7\u770b\u4e00\u4e0b\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat refs\/heads\/another\r\n6cf4fd07bd3d1f982045f50fae9dc070d6967f36\r\n\r\n$ cat logs\/refs\/heads\/another\r\n0000000000000000000000000000000000000000 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699595907 +0900  branch: Created from master\r\n<\/code><\/pre>\n<p>\u53c2\u8003\/\u30d6\u30e9\u30f3\u30c1\/another \u6307\u5411\u4e0e master \u76f8\u540c\u7684\u63d0\u4ea4\u3002<br \/>\n\u6211\u4f1a\u67e5\u770b\u65e5\u5fd7\u4ee5\u786e\u8ba4\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">log<\/span> <span class=\"na\">--oneline\r\n<\/span><span class=\"m\">6<\/span><span class=\"kd\">cf4fd0<\/span> <span class=\"o\">(<\/span><span class=\"kd\">HEAD<\/span> <span class=\"o\">-&gt;<\/span> <span class=\"kd\">master<\/span><span class=\"o\">,<\/span> <span class=\"kd\">another<\/span><span class=\"o\">)<\/span> <span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"m\">023<\/span><span class=\"kd\">bd50<\/span> <span class=\"kd\">first<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<h1>\u5207\u6362\u5206\u652f<\/h1>\n<p>\u90a3\u4e48\uff0c\u8ba9\u6211\u4eec\u5c1d\u8bd5\u4f7f\u7528git checkout\u5207\u6362\u5206\u652f\u3002<br \/>\n\u6211\u5c06\u5207\u6362\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">checkout<\/span> <span class=\"kd\">another<\/span>\r\n<span class=\"kd\">Switched<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u73b0\u5728.git\u4f1a\u600e\u4e48\u6837\u5462\uff1f<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">HEAD<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n\r\n<\/span><span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u770b\u5230\u4e86\u5427\uff0cHEAD\u548clogs\/HEAD\u5df2\u7ecf\u66f4\u65b0\u4e86\u3002\u6211\u8bd5\u7740\u53d6\u51fa\u5b83\u4eec\u7684\u5dee\u5f02\u3002<\/p>\n<p>HEAD\u30d5\u30a1\u30a4\u30eb<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff HEAD -- HEAD\r\n<span class=\"gh\">diff --git a\/HEAD b\/HEAD\r\nindex cb089cd..b64c555 100644\r\n<\/span><span class=\"gd\">--- a\/HEAD\r\n<\/span><span class=\"gi\">+++ b\/HEAD\r\n<\/span><span class=\"p\">@@ -1 +1 @@<\/span>\r\n<span class=\"gd\">-ref: refs\/heads\/master\r\n<\/span><span class=\"gi\">+ref: refs\/heads\/another\r\n<\/span><\/code><\/pre>\n<p>\u521a\u521a\u521b\u5efa\u7684refs\/heads\/another\u6587\u4ef6\u5df2\u88ab\u66f4\u65b0\u4ee5\u5f15\u7528\u5b83\u3002\u5f53\u7136\uff0c\u8fd9\u662f\u7406\u6240\u5f53\u7136\u7684\uff0c\u56e0\u4e3aHEAD\u5df2\u88ab\u66f4\u65b0\u4e3a\u5f15\u7528another\u3002<br \/>\n\u518d\u6b21\u5f3a\u8c03\u4e00\u4e0b\uff0crefs\/heads\/another\u7684\u5185\u5bb9\u5982\u4e0b\u6240\u793a\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat refs\/heads\/another\r\n6cf4fd07bd3d1f982045f50fae9dc070d6967f36\r\n<\/code><\/pre>\n<p>\u4ece\u8fd9\u4e2a\u95ee\u9898\u4e2d\uff0cHEAD\u4f1a\u6301\u7eed\u6307\u5411\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u63d0\u4ea46cf4fd\u3002<\/p>\n<p>logs\/HEAD\u30d5\u30a1\u30a4\u30eb<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff HEAD -- logs\/HEAD\r\n<span class=\"gh\">diff --git a\/logs\/HEAD b\/logs\/HEAD\r\nindex 58d6c1d..9bb9ffe 100644\r\n<\/span><span class=\"gd\">--- a\/logs\/HEAD\r\n<\/span><span class=\"gi\">+++ b\/logs\/HEAD\r\n<\/span><span class=\"p\">@@ -1,2 +1,3 @@<\/span>\r\n 0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900 commit (initial): first commit\r\n 023bd50171db535beab09fed56bd5a9281b01555 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699594574 +0900 commit: second commit\r\n<span class=\"gi\">+6cf4fd07bd3d1f982045f50fae9dc070d6967f36 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699596443 +0900 checkout: moving from master to another\r\n<\/span><\/code><\/pre>\n<p>\u8fd9\u662f\u5173\u4e8eHEAD\u5f15\u7528\u7684\u65e5\u5fd7\u5bf9\u5427\u3002\u662f\u8fd9\u6837\u8bb0\u5f55\u65e5\u5fd7\u7684\u65b9\u5f0f\u3002<\/p>\n<h1>\u5c06git\u5408\u5e76<\/h1>\n<p>\u6700\u540e\uff0c\u6211\u4eec\u5c06\u8fdb\u884cgit merge\uff0c\u7136\u540e\u89c2\u5bdf.git\u6587\u4ef6\u5939\u3002<\/p>\n<h2>\u505a\u597d\u6e96\u5099<\/h2>\n<p>\u7531\u4e8e\u51c6\u5907\u5de5\u4f5c\u5f88\u7e41\u7410\uff0c\u6211\u4eec\u5c06\u51c6\u5907\u548c\u89c2\u5bdf\u7684\u6b65\u9aa4\u5206\u5f00\u4e86\u3002\u9996\u5148\uff0c\u4f5c\u4e3a\u51c6\u5907\u5de5\u4f5c\uff0c\u6211\u4eec\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a\u521b\u5efa\u4e86\u4e00\u4e2a\u9002\u5f53\u7684\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"another\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"third commit\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">another<\/span> <span class=\"kd\">cbc33d4<\/span><span class=\"o\">]<\/span> <span class=\"kd\">third<\/span> <span class=\"kd\">commit<\/span>\r\n <span class=\"m\">1<\/span> <span class=\"kd\">file<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">insertion<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n<\/code><\/pre>\n<p>.git\u6587\u4ef6\u5939\u7684\u72b6\u6001\u3002\u6ca1\u6709\u4ec0\u4e48\u7279\u522b\u503c\u5f97\u6ce8\u610f\u7684\u5730\u65b9\uff0c\u6240\u4ee5\u5148\u8fdb\u884c\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">COMMIT_EDITMSG<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/refs\/heads\/another\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">refs<\/span><span class=\"na\">\/heads\/another\r\n\r\n<\/span><span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">objects<\/span>\/11\/\r\n        <span class=\"kd\">objects<\/span>\/9b\/\r\n        <span class=\"kd\">objects<\/span><span class=\"na\">\/cb<\/span>\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"git commit 1\u56de\u76ee@another\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"kd\">d25acad<\/span><span class=\"o\">]<\/span> <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"m\">1<\/span>\u56de\u76ee@another\r\n<\/code><\/pre>\n<p>\u8fd9\u6b21\u5c06\u5207\u6362\u5230\u4e3b\u5206\u652fmaster\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">checkout<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Switched<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'master'<\/span>\r\n<\/code><\/pre>\n<p>.git\u6587\u4ef6\u5939\u7684\u72b6\u6001\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">HEAD<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n\r\n<\/span><span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"git checkout\u5f8canother\u2192master\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"kd\">c15e8de<\/span><span class=\"o\">]<\/span> <span class=\"kd\">git<\/span> <span class=\"kd\">checkout<\/span>\u5f8canother\u2192master\r\n <span class=\"m\">3<\/span> <span class=\"kd\">files<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">2<\/span> <span class=\"kd\">insertions<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n<\/code><\/pre>\n<p>\u7531\u4e8e\u4ece\u53e6\u4e00\u4e2a\u5206\u652f\u66f4\u65b0\u6587\u4ef6\u7684\u72b6\u6001\u56de\u5230\u4e86\u539f\u59cb\u7684\u4e3b\u5206\u652f\uff0c\u56e0\u6b64\uff0c\u201cindex\u201d\u4e5f\u88ab\u66f4\u65b0\u4e86\u3002<\/p>\n<h2>\u5408\u5e76<\/h2>\n<p>(Maaji)<\/p>\n<p>\u597d\u7684\uff0c\u6211\u73b0\u5728\u8981\u5c07\u53e6\u4e00\u500b\u5206\u652f\u5408\u4f75\u5230\u4e3b\u5206\u652f\u4e0a\u8a66\u8a66\u770b\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">merge<\/span> <span class=\"na\">--no-ff <\/span><span class=\"kd\">another<\/span>\r\n<span class=\"kd\">Merge<\/span> <span class=\"kd\">made<\/span> <span class=\"kd\">by<\/span> <span class=\"kd\">the<\/span> <span class=\"s1\">'recursive'<\/span> <span class=\"kd\">strategy<\/span>.\r\n <span class=\"kd\">sample<\/span>.txt <span class=\"o\">|<\/span> <span class=\"m\">2<\/span> <span class=\"o\">+-<\/span>\r\n <span class=\"m\">1<\/span> <span class=\"kd\">file<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">insertion<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n<\/code><\/pre>\n<p>.git\u6587\u4ef6\u5939\u7684\u72b6\u6001\u3002<\/p>\n<p>(The state of the .git folder.)<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/refs\/heads\/master\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">refs<\/span><span class=\"na\">\/heads\/master\r\n\r\n<\/span><span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">ORIG_HEAD<\/span>\r\n        <span class=\"kd\">objects<\/span><span class=\"na\">\/bb<\/span>\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u8ba9\u6211\u4eec\u6765\u770b\u770b\uff0c\u4e00\u4e2a\u65b0\u7684ORIG_HEAD\u548c\u5bf9\u8c61\u88ab\u751f\u6210\u4e86\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat ORIG_HEAD\r\n6cf4fd07bd3d1f982045f50fae9dc070d6967f36\r\n<\/code><\/pre>\n<p>\u6211\u4e0d\u8bb0\u5f97\u8fd9\u662f\u54ea\u4e2a\u54c8\u5e0c\u503c\u4e86&#8230;\u6240\u4ee5\u6211\u6765\u67e5\u770b\u4e00\u4e0b\u65e5\u5fd7\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">6<\/span><span class=\"kd\">cf4fd07bd3d1f982045f50fae9dc070d6967f36<\/span>\r\n<span class=\"nb\">tree<\/span> <span class=\"kd\">e3d14d7340059b5852f32f29574e98ff73eb3c47<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"m\">023<\/span><span class=\"kd\">bd50171db535beab09fed56bd5a9281b01555<\/span>\r\n<span class=\"kd\">author<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699594574<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n<span class=\"kd\">committer<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699594574<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n\r\n<span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">log<\/span> <span class=\"na\">--oneline --graph\r\n<\/span><span class=\"o\">*<\/span>   <span class=\"kd\">bb54bb5<\/span> <span class=\"o\">(<\/span><span class=\"kd\">HEAD<\/span> <span class=\"o\">-&gt;<\/span> <span class=\"kd\">master<\/span><span class=\"o\">)<\/span> <span class=\"kd\">Merge<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n<span class=\"o\">|<\/span>\\\r\n<span class=\"o\">|<\/span> <span class=\"o\">*<\/span> <span class=\"kd\">cbc33d4<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span> <span class=\"kd\">third<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">|<\/span>\/\r\n<span class=\"o\">*<\/span> <span class=\"m\">6<\/span><span class=\"kd\">cf4fd0<\/span> <span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">*<\/span> <span class=\"m\">023<\/span><span class=\"kd\">bd50<\/span> <span class=\"kd\">first<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<p>ORIG_HEAD\u6240\u5f15\u7528\u76846cf4fd\u662f\u4e3b\u5206\u652f(master)\u7684\u76f4\u524d\u63d0\u4ea4\uff0c\u6240\u4ee5\u901a\u8fc7git reset ORIG_HEAD &#8211;hard\u547d\u4ee4\u53ef\u4ee5\u56de\u5230\u5408\u5e76\u4e4b\u524d\u7684\u72b6\u6001\u3002<\/p>\n<p>\u65b0\u4ea7\u751f\u7684\u5bf9\u8c61\u662f\u4ec0\u4e48\u5185\u5bb9\u5462\uff1f<\/p>\n<pre class=\"post-pre\"><code><span class=\"kd\">MINGW64<\/span> <span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"kd\">bb54bb567fc99a85750561362e2dcd892f179434<\/span>\r\n<span class=\"nb\">tree<\/span> <span class=\"m\">11982<\/span><span class=\"kd\">c20951b8249234a871fb7fce5983fe1465f<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"m\">6<\/span><span class=\"kd\">cf4fd07bd3d1f982045f50fae9dc070d6967f36<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"kd\">cbc33d4a1844fddc6f4dad5918897d00a6eaa80f<\/span>\r\n<span class=\"kd\">author<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699598971<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n<span class=\"kd\">committer<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699598971<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n\r\n<span class=\"kd\">Merge<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n<\/code><\/pre>\n<p>\u8fd9\u4e2a\u5408\u5e76\u63d0\u4ea4\u662f\u5f15\u7528\u4e86\u4e24\u4e2a\u7236\u5bf9\u8c61\u7684\u5bf9\u8c61\uff0c\u5bf9\u5427\u3002<\/p>\n<p>\u7531\u4e8e\u6d4f\u89c8\u5176\u4ed6\u6587\u4ef6\u4f1a\u611f\u5230\u538c\u70e6\uff0c\u6240\u4ee5\u6211\u53ea\u4f1a\u67e5\u770b\u4e2a\u4eba\u611f\u5174\u8da3\u7684logs\u76ee\u5f55\u4e0b\u7684\u6587\u4ef6\u3002<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff logs\/\r\n<span class=\"gh\">diff --git a\/logs\/HEAD b\/logs\/HEAD\r\nindex c43111f..eb4e0a5 100644\r\n<\/span><span class=\"gd\">--- a\/logs\/HEAD\r\n<\/span><span class=\"gi\">+++ b\/logs\/HEAD\r\n<\/span><span class=\"p\">@@ -4,3 +4,4 @@<\/span>\r\n 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699596443 +0900 checkout: moving from master to another\r\n 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 cbc33d4a1844fddc6f4dad5918897d00a6eaa80f hogehoge &lt;fugafuga&gt; 1699598305 +0900 commit: third commit\r\n cbc33d4a1844fddc6f4dad5918897d00a6eaa80f 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699598624 +0900 checkout: moving from another to master\r\n<span class=\"gi\">+6cf4fd07bd3d1f982045f50fae9dc070d6967f36 bb54bb567fc99a85750561362e2dcd892f179434 hogehoge &lt;fugafuga&gt; 1699598971 +0900 merge another: Merge made by the 'recursive' strategy.\r\n<\/span><span class=\"gh\">diff --git a\/logs\/refs\/heads\/master b\/logs\/refs\/heads\/master\r\nindex 58d6c1d..1256f4a 100644\r\n<\/span><span class=\"gd\">--- a\/logs\/refs\/heads\/master\r\n<\/span><span class=\"gi\">+++ b\/logs\/refs\/heads\/master\r\n<\/span><span class=\"p\">@@ -1,2 +1,3 @@<\/span>\r\n 0000000000000000000000000000000000000000 023bd50171db535beab09fed56bd5a9281b01555 hogehoge &lt;fugafuga&gt; 1699592736 +0900 commit (initial): first commit\r\n 023bd50171db535beab09fed56bd5a9281b01555 6cf4fd07bd3d1f982045f50fae9dc070d6967f36 hogehoge &lt;fugafuga&gt; 1699594574 +0900 commit: second commit\r\n<span class=\"gi\">+6cf4fd07bd3d1f982045f50fae9dc070d6967f36 bb54bb567fc99a85750561362e2dcd892f179434 hogehoge &lt;fugafuga&gt; 1699598971 +0900 merge another: Merge made by the 'recursive' strategy.\r\n<\/span>\r\n<\/code><\/pre>\n<p>\u65e5\u5fd7\u4e0d\u4f1a\u8fd9\u4e48\u5199\u7684\u3002<\/p>\n<h2>\u7ade\u5408 h\u00e9)<\/h2>\n<p>\u5982\u679c\u7ade\u4e89\u4f7f\u7528\uff0c\u4f1a\u53d1\u751f\u4ec0\u4e48\u5462\uff1f<br \/>\n\u6211\u5c06\u5728\u4e3b\u6587\u4ef6\u548c\u53e6\u4e00\u4e2a\u6587\u4ef6\u4e2d\u968f\u610f\u8fdb\u884c\u7f16\u8f91\u3002<\/p>\n<pre class=\"post-pre\"><code>\u8aac\u660e\uff1amaster\u30d6\u30e9\u30f3\u30c1\u3067\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"master\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"fourth commit\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"m\">61<\/span><span class=\"kd\">dd6f5<\/span><span class=\"o\">]<\/span> <span class=\"kd\">fourth<\/span> <span class=\"kd\">commit<\/span>\r\n <span class=\"m\">1<\/span> <span class=\"kd\">file<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">insertion<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n\r\n\u8aac\u660e\uff1aanother\u30d6\u30e9\u30f3\u30c1\u3067\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">checkout<\/span> <span class=\"kd\">another<\/span>\r\n<span class=\"kd\">Switched<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"another branch\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span> <span class=\"na\">-m<\/span><span class=\"s2\">\"fifth commit\"<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">another<\/span> <span class=\"kd\">bd61df7<\/span><span class=\"o\">]<\/span> <span class=\"kd\">fifth<\/span> <span class=\"kd\">commit<\/span>\r\n <span class=\"m\">1<\/span> <span class=\"kd\">file<\/span> <span class=\"kd\">changed<\/span><span class=\"o\">,<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">insertion<\/span><span class=\"o\">(+),<\/span> <span class=\"m\">1<\/span> <span class=\"kd\">deletion<\/span><span class=\"o\">(-)<\/span>\r\n\r\n\u8aac\u660e\uff1amaster\u30d6\u30e9\u30f3\u30c1\u3067\u30de\u30fc\u30b8\u3059\u308b\u306e\u3067\u79fb\u52d5\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">checkout<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Switched<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'master'<\/span>\r\n<\/code><\/pre>\n<p>\u73b0\u5728\u7684\u611f\u89c9\u5c31\u50cf\u8fd9\u6837\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">log<\/span> <span class=\"na\">--graph --oneline --all\r\n<\/span><span class=\"o\">*<\/span> <span class=\"kd\">bd61df7<\/span> <span class=\"o\">(<\/span><span class=\"kd\">another<\/span><span class=\"o\">)<\/span> <span class=\"kd\">fifth<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">|<\/span> <span class=\"o\">*<\/span> <span class=\"m\">61<\/span><span class=\"kd\">dd6f5<\/span> <span class=\"o\">(<\/span><span class=\"kd\">HEAD<\/span> <span class=\"o\">-&gt;<\/span> <span class=\"kd\">master<\/span><span class=\"o\">)<\/span> <span class=\"kd\">fourth<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">|<\/span> <span class=\"o\">*<\/span>   <span class=\"kd\">bb54bb5<\/span> <span class=\"kd\">Merge<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n<span class=\"o\">|<\/span> <span class=\"o\">|<\/span>\\\r\n<span class=\"o\">|<\/span> <span class=\"o\">|<\/span>\/\r\n<span class=\"o\">|<\/span>\/<span class=\"o\">|<\/span>\r\n<span class=\"o\">*<\/span> <span class=\"o\">|<\/span> <span class=\"kd\">cbc33d4<\/span> <span class=\"kd\">third<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">|<\/span>\/\r\n<span class=\"o\">*<\/span> <span class=\"m\">6<\/span><span class=\"kd\">cf4fd0<\/span> <span class=\"kd\">second<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">*<\/span> <span class=\"m\">023<\/span><span class=\"kd\">bd50<\/span> <span class=\"kd\">first<\/span> <span class=\"kd\">commit<\/span>\r\n<\/code><\/pre>\n<p>\u597d\u5427\uff0c\u6211\u6765\u5408\u5e76\u5e76\u7ade\u4e89\u5b83\u4eec\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">merge<\/span> <span class=\"na\">--no-ff <\/span><span class=\"kd\">another<\/span>\r\n<span class=\"kd\">Auto<\/span><span class=\"na\">-merging <\/span><span class=\"kd\">sample<\/span>.txt\r\n<span class=\"kd\">CONFLICT<\/span> <span class=\"o\">(<\/span><span class=\"kd\">content<\/span><span class=\"o\">)<\/span>: <span class=\"kd\">Merge<\/span> <span class=\"kd\">conflict<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">sample<\/span>.txt\r\n<span class=\"kd\">Automatic<\/span> <span class=\"kd\">merge<\/span> <span class=\"kd\">failed<\/span><span class=\"o\">;<\/span> <span class=\"kd\">fix<\/span> <span class=\"kd\">conflicts<\/span> <span class=\"kd\">and<\/span> <span class=\"kd\">then<\/span> <span class=\"kd\">commit<\/span> <span class=\"kd\">the<\/span> <span class=\"kd\">result<\/span>.\r\n<\/code><\/pre>\n<p>\u7ade\u5408\u4e86\u3002.git\u6587\u4ef6\u5939\u600e\u4e48\u6837\u4e86\u5462\uff1f<\/p>\n<pre class=\"post-pre\"><code> <span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">ORIG_HEAD<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n\r\n<span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">MERGE_HEAD<\/span>\r\n        <span class=\"kd\">MERGE_MODE<\/span>\r\n        <span class=\"kd\">MERGE_MSG<\/span>\r\n        <span class=\"kd\">objects<\/span>\/7a\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u6211\u4eec\u6765\u770b\u4e00\u4e0b\u521a\u521a\u5408\u5e76\u65f6\u751f\u6210\u7684\u6587\u4ef6\uff0c\u90a3\u4e9b\u5728\u4e4b\u524d\u6ca1\u6709\u7684\u3002\u8ba9\u6211\u4eec\u67e5\u770bMERGE_HEAD\u3001MERGE_MODE\u548cMERGE_MSG\u7684\u5185\u5bb9\u3002<\/p>\n<pre class=\"post-pre\"><code>$ cat MERGE_HEAD\r\nbd61df78647648b52c932db29880eda9f0e6b72f\r\n\r\n$ cat MERGE_MODE\r\nno-ff\r\n\r\n$ cat MERGE_MSG\r\nMerge branch 'another'\r\n\r\n# Conflicts:\r\n#       sample.txt\r\n<\/code><\/pre>\n<p>MERGE_HEAD\u6307\u7684\u662f\u5c06\u8981\u5408\u5e76\u7684\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\uff08\u5728\u6b64\u4f8b\u4e2d\u662fanother\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\uff09\u3002<\/p>\n<p>\u7531\u4e8e\u751f\u6210\u4e86\u4ee57a\u5f00\u5934\u7684\u5bf9\u8c61\uff0c\u6211\u4eec\u6765\u770b\u4e00\u4e0b\u5b83\u7684\u5185\u5bb9\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">7<\/span><span class=\"kd\">a67e00d6b7bee74c0f0ebdd167f22400ea80f9b<\/span>\r\n<span class=\"o\">&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/span> <span class=\"kd\">HEAD<\/span>\r\n<span class=\"kd\">master<\/span>\r\n<span class=\"o\">=======<\/span>\r\n<span class=\"kd\">another<\/span> <span class=\"kd\">branch<\/span>\r\n<span class=\"o\">&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/span> <span class=\"kd\">another<\/span>\r\n<\/code><\/pre>\n<p>\u5bf9\u5427\uff0c\u4e00\u65e6\u7ade\u5408\uff0c\u5c31\u4f1a\u751f\u6210\u4e00\u4e2adiff\u683c\u5f0f\u7684\u5bf9\u8c61\u3002<\/p>\n<p>\u4e0b\u4e00\u4e2a\u66f4\u65b0\u5c06\u662fORIG_HEAD\u3002<br \/>\n\u4e0e\u5148\u524d\u76f8\u540c\uff0c\u6307\u7684\u662f\u5408\u5e76\u4e4b\u524d\u7684\u63d0\u4ea4\u3002<\/p>\n<pre class=\"post-pre\"><code>~\/Desktop\/git\/sample2\/.git (master)\r\n$ git diff ORIG_HEAD\r\n<span class=\"gh\">diff --git a\/ORIG_HEAD b\/ORIG_HEAD\r\nindex ed3d53b..6eb6ba5 100644\r\n<\/span><span class=\"gd\">--- a\/ORIG_HEAD\r\n<\/span><span class=\"gi\">+++ b\/ORIG_HEAD\r\n<\/span><span class=\"p\">@@ -1 +1 @@<\/span>\r\n<span class=\"gd\">-6cf4fd07bd3d1f982045f50fae9dc070d6967f36\r\n<\/span><span class=\"gi\">+61dd6f56c96d9a3edef66cce619cf2915d76205e\r\n<\/span><\/code><\/pre>\n<p>\u5982\u679c\u4e2d\u6b62\uff08abort\uff09\u64cd\u4f5c\uff0c.git\u6587\u4ef6\u5939\u4f1a\u600e\u4e48\u6837\u5462?<br \/>\n\u4e2d\u6b62\uff08abort\uff09\u540e\u7684.git\u6587\u4ef6\u5939\u72b6\u6001\u5c06\u4f1a\u662f\u4ee5\u4e0b\u7684\u6837\u5b50\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\/rm &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_HEAD<\/span>\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_MODE<\/span>\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_MSG<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n\r\n<\/span><span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>\u8fd9\u4e9b\u6587\u4ef6\u5df2\u7ecf\u6d88\u5931\u4e86\uff0c\u800c\u4e14\u5373\u4f7f\u5408\u5e76\u5b8c\u6210\u4e5f\u53ef\u80fd\u4f1a\u6d88\u5931\u3002<\/p>\n<p>\u5728\u6a21\u62df\u524d\u9762\u7684\u7ade\u4e89\u4e4b\u540e\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u89e3\u51b3\u7ade\u4e89\u5e76\u8fdb\u884c\u5408\u5e76\u3002<br \/>\n\u7701\u7565\u4e86\u7ade\u4e89\u7684\u6a21\u62df\u3002\u2193\u4ece\u7ade\u4e89\u53d1\u751f\u5230\u89e3\u51b3\u7ade\u4e89\u7684\u8fc7\u7a0b\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">|<\/span><span class=\"kd\">MERGING<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">You<\/span> <span class=\"kd\">have<\/span> <span class=\"kd\">unmerged<\/span> <span class=\"kd\">paths<\/span>.\r\n  <span class=\"o\">(<\/span><span class=\"kd\">fix<\/span> <span class=\"kd\">conflicts<\/span> <span class=\"kd\">and<\/span> <span class=\"nb\">run<\/span> <span class=\"s2\">\"git commit\"<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git merge --abort\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">abort<\/span> <span class=\"kd\">the<\/span> <span class=\"kd\">merge<\/span><span class=\"o\">)<\/span>\r\n\r\n<span class=\"kd\">Unmerged<\/span> <span class=\"kd\">paths<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">mark<\/span> <span class=\"kd\">resolution<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">both<\/span> <span class=\"kd\">modified<\/span>:   <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">|<\/span><span class=\"kd\">MERGING<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">diff<\/span>\r\n<span class=\"kd\">diff<\/span> <span class=\"na\">--cc <\/span><span class=\"kd\">sample<\/span>.txt\r\n<span class=\"kd\">index<\/span> <span class=\"m\">1<\/span><span class=\"kd\">f7391f<\/span><span class=\"o\">,<\/span><span class=\"m\">5<\/span><span class=\"kd\">d70384<\/span>..0000000\r\n<span class=\"o\">---<\/span> <span class=\"kd\">a<\/span><span class=\"na\">\/sample<\/span>.txt\r\n<span class=\"o\">+++<\/span> <span class=\"kd\">b<\/span><span class=\"na\">\/sample<\/span>.txt\r\n@@@ <span class=\"o\">-<\/span><span class=\"m\">1<\/span><span class=\"o\">,<\/span><span class=\"m\">1<\/span> <span class=\"o\">-<\/span><span class=\"m\">1<\/span><span class=\"o\">,<\/span><span class=\"m\">1<\/span> <span class=\"o\">+<\/span><span class=\"m\">1<\/span><span class=\"o\">,<\/span><span class=\"m\">5<\/span> @@@\r\n<span class=\"o\">++&lt;&lt;&lt;&lt;&lt;&lt;&lt;<\/span> <span class=\"kd\">HEAD<\/span>\r\n <span class=\"na\">+master\r\n<\/span><span class=\"o\">++=======<\/span>\r\n<span class=\"o\">+<\/span> <span class=\"kd\">another<\/span> <span class=\"kd\">branch<\/span>\r\n<span class=\"o\">++&gt;&gt;&gt;&gt;&gt;&gt;&gt;<\/span> <span class=\"kd\">another<\/span>\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">|<\/span><span class=\"kd\">MERGING<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"nb\">echo<\/span> <span class=\"s2\">\"master\"<\/span> <span class=\"o\">&gt;<\/span> <span class=\"kd\">sample<\/span>.txt\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">|<\/span><span class=\"kd\">MERGING<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">add<\/span> .\r\n\r\n<span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">|<\/span><span class=\"kd\">MERGING<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">commit<\/span>\r\n<span class=\"o\">[<\/span><span class=\"kd\">master<\/span> <span class=\"m\">8254984<\/span><span class=\"o\">]<\/span> <span class=\"kd\">Merge<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u89e3\u51b3\u7ade\u5408\u95ee\u9898\uff0c\u6211\u4eec\u6210\u529f\u8fdb\u884c\u4e86\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n<p>\u300c.git\u300d\u6587\u4ef6\u5939\u7684\u72b6\u6001\u662f\u8fd9\u6837\u7684\u3002<\/p>\n<pre class=\"post-pre\"><code> <span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span>\/.git <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">status<\/span>\r\n<span class=\"kd\">On<\/span> <span class=\"kd\">branch<\/span> <span class=\"kd\">master<\/span>\r\n<span class=\"kd\">Changes<\/span> <span class=\"ow\">not<\/span> <span class=\"kd\">staged<\/span> <span class=\"k\">for<\/span> <span class=\"kd\">commit<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\/rm &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">update<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git checkout -- &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">discard<\/span> <span class=\"kd\">changes<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">working<\/span> <span class=\"kd\">directory<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">COMMIT_EDITMSG<\/span>\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_HEAD<\/span>\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_MODE<\/span>\r\n        <span class=\"kd\">deleted<\/span>:    <span class=\"kd\">MERGE_MSG<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">index<\/span>\r\n        <span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/HEAD\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">logs<\/span><span class=\"na\">\/refs\/heads\/master\r\n        <\/span><span class=\"kd\">modified<\/span>:   <span class=\"kd\">refs<\/span><span class=\"na\">\/heads\/master\r\n\r\n<\/span><span class=\"kd\">Untracked<\/span> <span class=\"kd\">files<\/span>:\r\n  <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add &lt;file&gt;...\"<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">include<\/span> <span class=\"k\">in<\/span> <span class=\"kd\">what<\/span> <span class=\"kd\">will<\/span> <span class=\"kd\">be<\/span> <span class=\"kd\">committed<\/span><span class=\"o\">)<\/span>\r\n\r\n        <span class=\"kd\">objects<\/span>\/82\/\r\n\r\n<span class=\"kd\">no<\/span> <span class=\"kd\">changes<\/span> <span class=\"kd\">added<\/span> <span class=\"kd\">to<\/span> <span class=\"kd\">commit<\/span> <span class=\"o\">(<\/span><span class=\"kd\">use<\/span> <span class=\"s2\">\"git add\"<\/span> <span class=\"kd\">and<\/span><span class=\"na\">\/or <\/span><span class=\"s2\">\"git commit -a\"<\/span><span class=\"o\">)<\/span>\r\n<\/code><\/pre>\n<p>&#8211;\u4e0eabort\u76f8\u540c\uff0cMERGE_HEAD\u3001MERGE_MODE\u3001MERGE_MSG\u5747\u5df2\u6d88\u5931\u3002<\/p>\n<p>\u6b64\u5916\uff0c\u5df2\u7ecf\u751f\u6210\u4e86\u5408\u5e76\u63d0\u4ea4\u7684\u5bf9\u8c61\u3002<\/p>\n<pre class=\"post-pre\"><code><span class=\"o\">~<\/span><span class=\"na\">\/Desktop\/git\/sample<\/span><span class=\"m\">2<\/span> <span class=\"o\">(<\/span><span class=\"kd\">master<\/span><span class=\"o\">)<\/span>\r\n$ <span class=\"kd\">git<\/span> <span class=\"kd\">cat<\/span><span class=\"na\">-file -p <\/span><span class=\"m\">8254984<\/span><span class=\"kd\">b906f193d27c2e4f55ee75991155bcedf<\/span>\r\n<span class=\"nb\">tree<\/span> <span class=\"kd\">d9fd303cfe17e779b06fe84c97c970ba22253c4b<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"m\">61<\/span><span class=\"kd\">dd6f56c96d9a3edef66cce619cf2915d76205e<\/span>\r\n<span class=\"kd\">parent<\/span> <span class=\"kd\">bd61df78647648b52c932db29880eda9f0e6b72f<\/span>\r\n<span class=\"kd\">author<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699601812<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n<span class=\"kd\">committer<\/span> <span class=\"kd\">hogehoge<\/span> <span class=\"o\">&lt;<\/span><span class=\"kd\">fugafuga<\/span><span class=\"o\">&gt;<\/span> <span class=\"m\">1699601812<\/span> <span class=\"o\">+<\/span><span class=\"m\">0900<\/span>\r\n\r\n<span class=\"kd\">Merge<\/span> <span class=\"kd\">branch<\/span> <span class=\"s1\">'another'<\/span>\r\n<\/code><\/pre>\n<p>\u4ee5\u4e0a\u662f\u4eca\u5929\u5173\u4e8e\u5c06\u201c.git\u201d\u7ba1\u7406\u6210\u201cGit\u201d\u7684\u6f14\u793a\u7684\u7ed3\u675f\u3002<br \/>\n\u611f\u8c22\u5927\u5bb6\u4e00\u76f4\u9605\u8bfb\u5230\u6700\u540e\u3002<\/p>\n<h1>\u6709\u5173\u300cindex\u300d\u6587\u4ef6\u7684\u8865\u5145\u8bf4\u660e<\/h1>\n<p>\u4ee5\u4e0b\u662f\u5173\u4e8e\u4e00\u76f4\u88ab\u987d\u56fa\u5730\u5ffd\u89c6\u7684\u7d22\u5f15\u6587\u4ef6\u7684\u8865\u5145\u8bf4\u660e\u3002<\/p>\n<p>\u7d22\u5f15\u6587\u4ef6\u662f\u4e00\u4e2a\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u56e0\u6b64\u6211\u4eec\u505c\u6b62\u4e86\u89c2\u5bdf\uff0c\u4f46\u987e\u540d\u601d\u4e49\uff0c\u7d22\u5f15\u6587\u4ef6\u662f\u7528\u4e8e\u8868\u793a\u7d22\u5f15\u72b6\u6001\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u3002\u5b83\u4e0e\u6811\u5bf9\u8c61\u7c7b\u4f3c\uff0c\u5177\u6709\u6811\u5f15\u7528\u3001\u6587\u4ef6\u540d\u548c\u6570\u636e\u5757\u7684\u5bf9\u5e94\u5173\u7cfb\u3002<\/p>\n<p>\u5c06\u7d22\u5f15\u6587\u4ef6\u7684\u521b\u5efa\u548c\u66f4\u65b0\u603b\u7ed3\u5982\u4e0b\uff1a<\/p>\n<p>git add\uff1a\u521d\u56de\u306e\u307findex\u4f5c\u6210\u3001\u305d\u306e\u5f8c\u306f\u66f4\u65b0<\/p>\n<p>git commit\uff1aindex\u66f4\u65b0<\/p>\n<p>git branch\uff1a\u306a\u306b\u3082\u306a\u3057<\/p>\n<p>git checkout\uff1a\u306a\u306b\u3082\u306a\u3057<\/p>\n<p>git merge\uff1aindex\u66f4\u65b0<\/p>\n<p>\u5f53\u6267\u884cgit add\u547d\u4ee4\u65f6\uff0c\u7d22\u5f15\u6587\u4ef6\u4f1a\u88ab\u66f4\u65b0\uff0c\u5e76\u5728git commit\u65f6\u521b\u5efa\u6811\u5bf9\u8c61\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u6267\u884cgit add\u547d\u4ee4\u65f6\uff0c\u6811\u5bf9\u8c61\u4e0d\u4f1a\u88ab\u521b\u5efa\uff0c\u53ea\u4f1a\u66f4\u65b0\u7d22\u5f15\u6587\u4ef6\u3002\u5728git commit\u65f6\uff0c\u6811\u5bf9\u8c61\u4f1a\u88ab\u521b\u5efa\uff0c\u5e76\u4e14\u4f1a\u7528\u7d22\u5f15\u7684\u5185\u5bb9\u8fdb\u884c\u66ff\u6362\u3002\u901a\u8fc7\u8fd9\u6837\u505a\uff0c\u53ef\u4ee5\u786e\u4fdd\u6267\u884cgit add\u65f6\u5de5\u4f5c\u76ee\u5f55\u548c\u7d22\u5f15\u7684\u5185\u5bb9\u4e00\u81f4\uff0c\u5728\u6267\u884cgit commit\u65f6\uff0c\u5de5\u4f5c\u76ee\u5f55\u3001\u7d22\u5f15\u548c\u5b58\u50a8\u5e93\u7684\u5185\u5bb9\u4e00\u81f4\u3002<\/p>\n<h1>\u6700\u540e<\/h1>\n<p>\u6211\u4e00\u8fb9\u8f93\u5165\u547d\u4ee4\u4e00\u8fb9\u5199\u6587\u7ae0\uff0c\u4f46\u9014\u4e2d\u51fa\u9519\u5e76\u4fee\u6539\u4e86\u90e8\u5206\u547d\u4ee4\u7ed3\u679c\u540e\u624d\u53d1\u8868\u51fa\u6765\uff0c\u6240\u4ee5\u5982\u679c\u6709\u7ec6\u5fae\u9519\u8bef\u7684\u5730\u65b9\u8bf7\u539f\u8c05\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u9996\u5148 2023\u5e74Git\u5723\u8bde\u65e5\u5386\u7684\u7b2c\u4e09\u5929\u5e16\u5b50\u3002\u8bf7\u591a\u591a\u5173\u7167\u3002 \u6211\u8ba4\u4e3a\u5728\u4e0a\u6b21\u548c\u524d\u6b21\u7684\u5e16\u5b50\u4e2d\uff0c\u5df2\u7ecf\u80fd\u591f\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e86\u3002 [&hellip;]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37101","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406 - 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\/\u6211\u5c1d\u8bd5\u5c06\u3010git\u3011\u7684-git\u6587\u4ef6\u5939\u4ea4\u7ed9git\u8fdb\u884c\u7ba1\u7406\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 2023\u5e74Git\u5723\u8bde\u65e5\u5386\u7684\u7b2c\u4e09\u5929\u5e16\u5b50\u3002\u8bf7\u591a\u591a\u5173\u7167\u3002 \u6211\u8ba4\u4e3a\u5728\u4e0a\u6b21\u548c\u524d\u6b21\u7684\u5e16\u5b50\u4e2d\uff0c\u5df2\u7ecf\u80fd\u591f\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e86\u3002 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u6211\u5c1d\u8bd5\u5c06\u3010git\u3011\u7684-git\u6587\u4ef6\u5939\u4ea4\u7ed9git\u8fdb\u884c\u7ba1\u7406\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-02-01T17:43:29+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T02:35:31+00:00\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"15 \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\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/\",\"name\":\"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-02-01T17:43:29+00:00\",\"dateModified\":\"2024-04-30T02:35:31+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406\"}]},{\"@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\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406 - 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\/\u6211\u5c1d\u8bd5\u5c06\u3010git\u3011\u7684-git\u6587\u4ef6\u5939\u4ea4\u7ed9git\u8fdb\u884c\u7ba1\u7406\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406","og_description":"\u9996\u5148 2023\u5e74Git\u5723\u8bde\u65e5\u5386\u7684\u7b2c\u4e09\u5929\u5e16\u5b50\u3002\u8bf7\u591a\u591a\u5173\u7167\u3002 \u6211\u8ba4\u4e3a\u5728\u4e0a\u6b21\u548c\u524d\u6b21\u7684\u5e16\u5b50\u4e2d\uff0c\u5df2\u7ecf\u80fd\u591f\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4e86\u3002 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u6211\u5c1d\u8bd5\u5c06\u3010git\u3011\u7684-git\u6587\u4ef6\u5939\u4ea4\u7ed9git\u8fdb\u884c\u7ba1\u7406\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-02-01T17:43:29+00:00","article_modified_time":"2024-04-30T02:35:31+00:00","author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"15 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/","name":"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-02-01T17:43:29+00:00","dateModified":"2024-04-30T02:35:31+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u6211\u5c1d\u8bd5\u5c06\u3010Git\u3011\u7684\u201c.git\u201d\u6587\u4ef6\u5939\u4ea4\u7ed9Git\u8fdb\u884c\u7ba1\u7406"}]},{"@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\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%88%91%e5%b0%9d%e8%af%95%e5%b0%86%e3%80%90git%e3%80%91%e7%9a%84-git%e6%96%87%e4%bb%b6%e5%a4%b9%e4%ba%a4%e7%bb%99git%e8%bf%9b%e8%a1%8c%e7%ae%a1%e7%90%86%e3%80%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37101","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\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37101"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37101\/revisions"}],"predecessor-version":[{"id":91391,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37101\/revisions\/91391"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37101"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37101"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37101"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}