<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/">
  <channel>
    <title>git on EuDs&#39;s Blog</title>
    <link>https://euds.org/tags/git/</link>
    <follow_challenge>
      <feedId>55788057182175234</feedId>
      <userId>67186528297029632</userId>
    </follow_challenge>
    <description>Recent content in git on EuDs&#39;s Blog</description>
    <generator>Hugo -- gohugo.io</generator>
    <language>en</language>
    <lastBuildDate>Sat, 28 Oct 2023 15:34:14 +0800</lastBuildDate><atom:link href="https://euds.org/tags/git/index.xml" rel="self" type="application/rss+xml" />
    <item>
      <title>进一步学习git</title>
      <link>https://euds.org/2023/dive-into-git/</link>
      <pubDate>Sat, 28 Oct 2023 15:34:14 +0800</pubDate>
      
      <guid>https://euds.org/2023/dive-into-git/</guid>
      <description>the information manager from hell</description>
      <content:encoded><![CDATA[<p><strong>使用git已经有一段时间了，在感受到其便利的同时，我开始好奇它究竟是如何实现的。</strong></p>
<p><strong>这篇文章主要是对参考链接中的几篇文章的结合和整理，我自己原创的内容并不多，算是我的阅读笔记。</strong></p>
<h2 id="3-main-components">3 main components</h2>
<h3 id="blobbinary-large-object">blob(binary large object)</h3>
<ol>
<li>git用于存储文件内容的基本数据对象</li>
<li>只包含文件内容的原始二进制数据。</li>
<li>唯一标识符是由其内容计算得到的 SHA-1 散列值,计算方法如下：
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-python" data-lang="python"><span class="line"><span class="cl"><span class="c1"># find-git-object.py</span>
</span></span><span class="line"><span class="cl"><span class="c1"># https://jvns.ca/blog/2023/09/14/in-a-git-repository--where-do-your-files-live-/</span>
</span></span><span class="line"><span class="cl"><span class="kn">import</span> <span class="nn">hashlib</span>
</span></span><span class="line"><span class="cl"><span class="kn">import</span> <span class="nn">sys</span>
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl"><span class="k">def</span> <span class="nf">object_path</span><span class="p">(</span><span class="n">content</span><span class="p">):</span>
</span></span><span class="line"><span class="cl">    <span class="n">header</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&#34;blob </span><span class="si">{</span><span class="nb">len</span><span class="p">(</span><span class="n">content</span><span class="p">)</span><span class="si">}</span><span class="se">\0</span><span class="s2">&#34;</span>
</span></span><span class="line"><span class="cl">    <span class="n">data</span> <span class="o">=</span> <span class="n">header</span><span class="o">.</span><span class="n">encode</span><span class="p">()</span> <span class="o">+</span> <span class="n">content</span>
</span></span><span class="line"><span class="cl">    <span class="n">digest</span> <span class="o">=</span> <span class="n">hashlib</span><span class="o">.</span><span class="n">sha1</span><span class="p">(</span><span class="n">data</span><span class="p">)</span><span class="o">.</span><span class="n">hexdigest</span><span class="p">()</span>
</span></span><span class="line"><span class="cl">    <span class="nb">print</span><span class="p">(</span><span class="n">digest</span><span class="p">)</span>
</span></span><span class="line"><span class="cl">    <span class="k">return</span> <span class="sa">f</span><span class="s2">&#34;.git/objects/</span><span class="si">{</span><span class="n">digest</span><span class="p">[:</span><span class="mi">2</span><span class="p">]</span><span class="si">}</span><span class="s2">/</span><span class="si">{</span><span class="n">digest</span><span class="p">[</span><span class="mi">2</span><span class="p">:]</span><span class="si">}</span><span class="s2">&#34;</span>
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl"><span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="s2">&#34;rb&#34;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
</span></span><span class="line"><span class="cl">    <span class="nb">print</span><span class="p">(</span><span class="n">object_path</span><span class="p">(</span><span class="n">f</span><span class="o">.</span><span class="n">read</span><span class="p">()))</span>
</span></span></code></pre></div></li>
<li>git使用上一步所得到的digest来确定文件所存储的位置。这种方法被称为“content addressed storage”。</li>
<li>由上可以发现：若文件内容完全相同，那么文件内容就将存储在同一个blob对象中。</li>
<li>确定位置后，我们使用<code>file</code>可以得到文件的类型<code>zlib compressed data</code>,并可使用以下python代码进行解码
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-python" data-lang="python"><span class="line"><span class="cl"><span class="c1"># https://jvns.ca/blog/2023/09/14/in-a-git-repository--where-do-your-files-live-/</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 可用来解码blob或commit文件</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 简易版的 git cat-file -p</span>
</span></span><span class="line"><span class="cl"><span class="kn">import</span> <span class="nn">zlib</span>
</span></span><span class="line"><span class="cl"><span class="kn">import</span> <span class="nn">sys</span>
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl"><span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="s2">&#34;rb&#34;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
</span></span><span class="line"><span class="cl">    <span class="n">content</span> <span class="o">=</span> <span class="n">f</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
</span></span><span class="line"><span class="cl">    <span class="nb">print</span><span class="p">(</span><span class="n">zlib</span><span class="o">.</span><span class="n">decompress</span><span class="p">(</span><span class="n">content</span><span class="p">)</span><span class="o">.</span><span class="n">decode</span><span class="p">())</span>
</span></span></code></pre></div></li>
</ol>
<h3 id="commit">commit</h3>
<ol>
<li>表示一次代码提交或版本更新的操作</li>
<li>a commit file contains tree, parent commit(if any), author, committer.</li>
<li>Commit file will be hashed and store in the same way as blob.</li>
<li>可以通过<code>git log</code>获取commit对应的sha-1值,并使用<code>git cat-file -p &lt;commit_hash&gt;</code>观察对应的commit文件,例如：
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">&gt; git cat-file -p a2392bba4e795aa1041ce4464c2da00391b51913
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl">tree 3b8155bcfb149e4cf627c2011eeef58b28e50348
</span></span><span class="line"><span class="cl">parent 3b43a50eb349f2f8126735ab1e133004bab0a933
</span></span><span class="line"><span class="cl">author EuDs63 &lt;erica23187@gmail.com&gt; <span class="m">1698421602</span> +0800
</span></span><span class="line"><span class="cl">committer EuDs63 &lt;erica23187@gmail.com&gt; <span class="m">1698421602</span> +0800
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl">add test.txt
</span></span></code></pre></div></li>
<li>每个 commit 对应的parent commit可以是零个、一个，或多个</li>
</ol>
<h3 id="tree">tree</h3>
<ol>
<li>
<p>用于构建和维护项目的目录结构</p>
</li>
<li>
<p>Each folder match a tree file which stores the structure of files and folders of the folder.</p>
</li>
<li>
<p>Tree file will be hashed and store in the same way as blob.</p>
</li>
<li>
<p>同样可以通过<code>git log</code>获取对应的sha-1值,并使用<code>git cat-file -p &lt;tree_hash&gt;</code>观察对应的tree文件</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">&gt; git cat-file -p 3b8155bcfb149e4cf627c2011eeef58b28e50348
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl"><span class="m">100644</span> blob 4b6e76588c44ca2a580f982c63f14200b4bffc3f    decompress.py
</span></span><span class="line"><span class="cl"><span class="m">100644</span> blob 211d3833fbe6ed59e66b38bbe643b5f7141ae53c    find-git-object.py
</span></span><span class="line"><span class="cl"><span class="m">100644</span> blob f100ad94f6be76f58fadaf9e720d9d00d486a088    test.txt
</span></span><span class="line"><span class="cl"><span class="m">100644</span> blob 131b0c74e5e1c21c7c9b830a57df7b8dadb5eda7    test1.txt
</span></span></code></pre></div></li>
<li>
<p>注意到<code>100644</code>这个数字，这表示该 Git 对象的类型和模式。
具体来说:</p>
<p>前4位1006表示对象类型:
1000 - 普通文件(blob 对象)
1006 - 可执行文件(blob 对象)
1007 - 符号链接(blob 对象)
1010 - 树(tree 对象)
1011 - 提交(commit 对象)
1114 - Gitlink(blob 对象)
后4位44表示文件模式,这在Unix系统中代表文件权限:
100644表示普通文件,权限是-rw-r&ndash;r&ndash;
100755表示可执行文件,权限是-rwxr-xr-x</p>
</li>
</ol>
<hr>
<h2 id="branch">branch</h2>
<ol>
<li>Branches are stored in <code>.git/refs/heads</code>.</li>
<li>Branches are files tracking commits, and the content of these files is updated at every commit we perform.</li>
<li>对remote branch的认识:
There are potentially three versions of every remote branch:
<ol>
<li>The actual branch on the remote repository</li>
<li>The snapshot of that branch locally</li>
<li>A local branch that might be tracking the remote branch</li>
</ol>
</li>
</ol>
<hr>
<h2 id="head">head</h2>
<ol>
<li>Head are stored in <code>.git/HEAD</code></li>
<li>通常情况下，HEAD文件中的内容为<code>ref: refs/heads/&lt;branch_name&gt;</code>,由此来间接指向该分支的最新commit。</li>
<li>When we are on a branch and perform the commit, Git reads the content of the HEAD file and writes the commit which is referenced as the parent commit.</li>
<li>We can checkout to a previous commit by <code>git checkout &lt;commit_hash&gt;</code>. Thus we will enter a mode called “detached mode” . In this mode, HEAD will point directly to a commit.</li>
</ol>
<hr>
<h2 id="what-happened-after-git-checkout">what happened after git checkout</h2>
<ol>
<li>
<p>解析命令行参数：首先，Git 解析命令行参数，以确定用户想要执行的 git checkout 操作的类型，包括切换分支、检出文件等。</p>
</li>
<li>
<p>获取目标分支/提交的 SHA-1 值：根据命令行参数中提供的分支名或提交标识符，Git 获取目标分支或提交的 SHA-1 值.</p>
</li>
<li>
<p>检查工作目录状态：Git 在切换分支或提交之前会检查当前工作目录状态，以确保没有未提交的更改。</p>
</li>
<li>
<p>切换到目标分支/提交：如果用户想要切换分支，Git 将会使用目标分支的 branch_name 更新 HEAD 引用，同时将目标分支的文件状态写入工作目录。如果用户要检出特定提交，Git 会根据提交的 SHA-1 值更新 HEAD 引用，并将提交的文件状态写入工作目录。</p>
</li>
<li>
<p>重建工作目录：在切换分支或提交后，Git 会确保工作目录的文件和内容与目标一致。它可能会涉及文件的创建、更新和删除操作。(根据commit文件中的tree去逐层展开)</p>
</li>
<li>
<p>更新索引和暂存区：Git 更新索引，以反映工作目录中文件的状态。这涉及将工作目录的文件与索引中的文件状态进行比较，并记录更改。（暂存区是介于Working Directory和 Repository 之间的区域，用于存放已经使用 git add 命令添加但尚未提交的文件和更改。）</p>
</li>
<li>
<p>更新 HEAD 指针：最后，Git 更新 HEAD 引用，将其指向所选的目标分支或提交，以反映当前的状态。</p>
</li>
</ol>
<h2 id="how-git-log-filename-works">how <code>git log &lt;filename&gt;</code> works</h2>
<ol>
<li>go through every single commit in the history</li>
<li>go through the various directory trees</li>
<li>search for the filename we wanted</li>
</ol>
<hr>
<h2 id="about-git-submodule">about git submodule</h2>
<h3 id="远程仓库的子模块链接错了指向了一个不同的仓库">远程仓库的子模块链接错了，指向了一个不同的仓库</h3>
<ol>
<li>检查并修复 .gitmodules 文件
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl"><span class="o">[</span>submodule <span class="s2">&#34;path/to/submodule&#34;</span><span class="o">]</span>
</span></span><span class="line"><span class="cl"> <span class="nv">path</span> <span class="o">=</span> path/to/submodule
</span></span><span class="line"><span class="cl"> <span class="nv">url</span> <span class="o">=</span> git@correct-url.git
</span></span></code></pre></div></li>
<li>检查 .git/config 中的子模块配置
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl"><span class="o">[</span>submodule <span class="s2">&#34;path/to/submodule&#34;</span><span class="o">]</span>
</span></span><span class="line"><span class="cl"> <span class="nv">url</span> <span class="o">=</span> git@correct-url.git
</span></span></code></pre></div></li>
<li>提交 .gitmodules 文件的更改</li>
<li>更新 Git 子模块配置： <code>git submodule sync</code></li>
<li>更新子模块的内容： <code>git submodule update --init --recursive</code></li>
<li>推送更改</li>
</ol>
<hr>
<h2 id="how-does-git-diff-works">how does git diff works</h2>
<p>to do!</p>
<h2 id="git-reset-hardsoftmixed">git reset hard|soft|mixed</h2>
<p>to do!</p>
<h2 id="git-rebase">git rebase</h2>
<p>to do!</p>
<h2 id="git-hook">git hook</h2>
<ul>
<li><a href="https://git-scm.com/book/zh/v2/%E8%87%AA%E5%AE%9A%E4%B9%89-Git-Git-%E9%92%A9%E5%AD%90"  target="_blank" rel="noopener" >Git - Git 钩子</a></li>
<li>如何在本地监听git tag事件</li>
</ul>
<h2 id="收获">收获</h2>
<ul>
<li>之前看过一句话，&ldquo;In Linux and UNIX, everything is a file&rdquo;。现在发现git中也是这样设计的。</li>
<li>了解平时使用的工具是怎么做到的，尤其是一些不了解之前觉得很神奇的操作背后的原理，我觉得这挺有趣。</li>
</ul>
<h2 id="碎碎念">碎碎念</h2>
<p>距离这篇文章的创建已经小半年了，那位作者已经写了近10篇git相关的博文。我学习的进度甚至比不上其写作的进度，不禁叹服。希望未来的我能好好看完。</p>
<h2 id="参考链接">参考链接</h2>
<ul>
<li><a href="https://jvns.ca/blog/2023/09/14/in-a-git-repository--where-do-your-files-live-/"  target="_blank" rel="noopener" >In a git repository, where do your files live?</a></li>
<li><a href="https://github.com/cpina/github-action-push-to-another-repository/blob/main/entrypoint.sh"  target="_blank" rel="noopener" >github-action-push-to-another-repository/entrypoint.sh at main · cpina/github-action-push-to-another-repository</a></li>
<li><a href="https://towardsdatascience.com/how-git-truly-works-cd9c375966f6"  target="_blank" rel="noopener" >How Git truly works. A deep dive on the internals to… | by Alberto Prospero | Towards Data Science</a></li>
</ul>
]]></content:encoded>
    </item>
    
    <item>
      <title>git常用命令</title>
      <link>https://euds.org/2023/git_cheatsheet/</link>
      <pubDate>Fri, 26 May 2023 13:18:01 +0800</pubDate>
      
      <guid>https://euds.org/2023/git_cheatsheet/</guid>
      <description>a cheatsheet of git commands</description>
      <content:encoded><![CDATA[<p><strong>本篇内容大部分非我原创，只是我自己整理的笔记，具体出处请见<a href="#%e5%8f%82%e8%80%83" >参考</a></strong></p>
<h2 id="clone">clone</h2>
<p>可以仅clone单个分支的最新内容</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git clone --single-branch --depth <span class="m">1</span> --branch <span class="s2">&#34;</span><span class="nv">$TARGET_BRANCH</span><span class="s2">&#34;</span> <span class="s2">&#34;</span><span class="nv">$GIT_CMD_REPOSITORY</span><span class="s2">&#34;</span> <span class="s2">&#34;</span><span class="nv">$CLONE_DIR</span><span class="s2">&#34;</span>
</span></span><span class="line"><span class="cl">
</span></span><span class="line"><span class="cl"><span class="c1"># </span>
</span></span><span class="line"><span class="cl"><span class="nv">GIT_CMD_REPOSITORY</span><span class="o">=</span><span class="s2">&#34;https://</span><span class="nv">$DESTINATION_REPOSITORY_USERNAME</span><span class="s2">:</span><span class="nv">$API_TOKEN_GITHUB</span><span class="s2">@</span><span class="nv">$GITHUB_SERVER</span><span class="s2">/</span><span class="nv">$DESTINATION_REPOSITORY_USERNAME</span><span class="s2">/</span><span class="nv">$DESTINATION_REPOSITORY_NAME</span><span class="s2">.git&#34;</span>
</span></span><span class="line"><span class="cl">git clone --single-branch --depth <span class="m">1</span> <span class="s2">&#34;</span><span class="nv">$GIT_CMD_REPOSITORY</span><span class="s2">&#34;</span> <span class="s2">&#34;</span><span class="nv">$CLONE_DIR</span><span class="s2">&#34;</span>
</span></span></code></pre></div><h2 id="add">add</h2>
<ul>
<li><code>git add .</code> 会根据.gitignore做过滤</li>
<li><code>git add *</code> 会忽略.gitignore把任何文件都加入</li>
<li><code>git add -p</code> 会逐个显示文件中的每组改动，并询问是否要加入 index</li>
</ul>
<h2 id="commit">commit</h2>
<p>可以通过环境变量更改提交时间哦</p>
<ul>
<li><code>export GIT_COMMITTER_DATE=”Jan 11 17:11:18 2018 +0800”</code></li>
<li><code>export GIT_AUTHOR_DATE=”Jan 11 17:11:18 2018 +0800”</code></li>
<li><code>git commit –amend –date=date -R</code></li>
</ul>
<h2 id="push">push</h2>
<p>文件推送的三个步骤：</p>
<pre tabindex="0"><code>git add 
git commit -m&#34;输入想说的话&#34;
git push
</code></pre><h2 id="status">status</h2>
<p><code>git status</code></p>
<h2 id="branch">branch</h2>
<ul>
<li>
<p>转到另一个分支 <code>git checkout {分支名}</code></p>
</li>
<li>
<p>查看本地分支 <code>git branch</code></p>
</li>
<li>
<p>查看远程分支 <code>git branch -r</code></p>
</li>
<li>
<p>查看本地和远程分支 <code>git branch -a</code></p>
</li>
<li>
<p>删除本地分支 <code>git branch -d {本地分支名}</code></p>
</li>
<li>
<p>强制删除本地分支<code>git branch -D {本地分支名}</code></p>
</li>
<li>
<p>删除远程分支 <code>git push origin --delete {远程分支名}</code></p>
</li>
<li>
<p>已经删除的远程分支但仍<code>git branch -a</code>时仍显示 ：<code>git remote prune origin</code></p>
</li>
</ul>
<h2 id="log">log</h2>
<ul>
<li><code>git log</code> 查看分支提交历史</li>
<li><code>git reflog</code> 也是查看日志，主要区别是会显示<code>reset --hard</code></li>
</ul>
<h2 id="reset">reset</h2>
<ul>
<li><code>git reset HEAD</code> 撤销上一次的<code>add</code></li>
<li><code>git reset HEAD ${filename}</code> 仅撤销某一文件</li>
<li><code>git reset --hard {commit_id}</code></li>
<li><code>git reset --hard HEAD^ </code> 回退到上一版本</li>
</ul>
<h2 id="config">config</h2>
<ul>
<li><code>git config --global user.name &quot;Your Name&quot;</code></li>
<li><code>git config --global user.email &quot;youremail@example.com&quot;</code></li>
<li><code>git config --global --list</code> 查看配置</li>
<li><code>git config --global http.proxy 'http://127.0.0.1:7890'</code></li>
<li><code>git config --global https.proxy 'http://127.0.0.1:7890'</code></li>
</ul>
<h2 id="tag">tag</h2>
<ul>
<li><code>git tag</code> 列出所有已有的标签</li>
<li>tag 分为两种：
<ul>
<li>lightweight tag，例：<code>git tag v1.0</code></li>
<li>annotated tag, 例： <code>git tag -a v2.0 -m &quot;version 2.0&quot;</code></li>
</ul>
</li>
<li><code> git tag -d v1.0</code> 删除标签</li>
<li><code>git push origin v2.0</code> 上传标签到远程仓库</li>
<li><code>git push origin --tags</code> 上传所有未推送过的本地标签</li>
<li><code>git fetch origin tag &lt;tagname&gt;</code> 下载远程仓库的标签</li>
</ul>
<h2 id="commit-message-type">commit message type</h2>
<ul>
<li>feat：新功能（feature）</li>
<li>fix：修补bug</li>
<li>docs：文档（documentation）</li>
<li>style： 格式（不影响代码运行的变动）</li>
<li>refactor：重构（即不是新增功能，也不是修改bug的代码变动）</li>
<li>test：增加测试</li>
<li>chore：构建过程或辅助工具的变动</li>
</ul>
<h2 id="git-查询">Git 查询</h2>
<p>在之前的所有提交信息里进行搜索，找到其中和搜索条件相匹配的最近的一条。</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">$ git show :/query
</span></span></code></pre></div><p>这里 <code>query</code> （区别大小写）是你想要搜索的词语， 这条命令会找到包含这个词语的最后那个提交并显示变动详情。</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">$ git show :/typo
</span></span></code></pre></div><p>
  <img loading="lazy" src="http://i.imgur.com/icaGiNt.png" alt="git show :/query"  /></p>
<p>注：按 <code>q</code> 键退出命令</p>
<h2 id="fetch">fetch</h2>
<ul>
<li>
<p><strong>同步其他分支</strong>
在远端 PR 被合并之后往往需要切换到主分支然后重现拉取代码，这会无意义地去重新触发一次旧版本的索引，下面这条命令可以在不切换分支的情况下更新 master 到最新: <code>git fetch origin master:master</code></p>
</li>
<li>
<p><strong>检出 Pull Requests</strong>
对 Github 仓库来说，Pull Request 是种特殊分支， 可以通过以下多种方式取到本地：</p>
<p>取出某个特定的 Pull Request 并临时作为本地的 <code>FETCH_HEAD</code> 中以便进行快速查看更改( diff )以及合并( merge )：</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">$ git fetch origin refs/pull/<span class="o">[</span>PR-Number<span class="o">]</span>/head
</span></span></code></pre></div><p>通过 refspec 获取所有的 Pull Request 为本地分支：</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">$ git fetch origin <span class="s1">&#39;+refs/pull/*/head:refs/remotes/origin/pr/*&#39;</span>
</span></span></code></pre></div></li>
</ul>
<h2 id="stash">stash</h2>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git stash <span class="c1"># when you want to record the current state of the working directory and the index, but want to go back to a clean working directory</span>
</span></span><span class="line"><span class="cl">git stash list 
</span></span><span class="line"><span class="cl">git stash pop
</span></span><span class="line"><span class="cl">git stash apply
</span></span></code></pre></div><h2 id="二分-debug">二分 debug</h2>
<p>给定两个提交记录 git 辅助你二分查找 bug 的引入时间，同时支持运行脚本</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git bisect start
</span></span><span class="line"><span class="cl">git bisect bad
</span></span><span class="line"><span class="cl">git bisect good v1.0.0
</span></span><span class="line"><span class="cl">git bisect reset
</span></span><span class="line"><span class="cl">git bisect start bad_commit good_commit
</span></span><span class="line"><span class="cl">git bisect run test-error.sh
</span></span></code></pre></div><h2 id="参考">参考</h2>
<ul>
<li><a href="https://github.com/tiimgreen/github-cheat-sheet/blob/master/README.zh-cn.md"  target="_blank" rel="noopener" >github-cheat-sheet/README.zh-cn.md at master · tiimgreen/github-cheat-sheet</a></li>
<li><a href="https://gist.github.com/rishavpandey43/84665ffe3cea76400d8e5a1ad7133a79"  target="_blank" rel="noopener" >This gist consist of the rules and best practice of good conventional git commit message</a></li>
<li><a href="https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53"  target="_blank" rel="noopener" >Commit message guidelines</a></li>
<li><a href="https://blog.frankzhao.cn/config_your_git/"  target="_blank" rel="noopener" >如何高效配置你的 Git - Frank 的个人博客</a></li>
<li><a href="https://git-scm.com/docs/git-stash"  target="_blank" rel="noopener" >Git - git-stash Documentation</a></li>
<li><a href="https://www.waterwater.moe/2020/06/24/2020-06-24_Git%E5%B0%8F%E8%B4%B4%E5%A3%AB/"  target="_blank" rel="noopener" >Git 小贴士 | Water Space</a></li>
</ul>
]]></content:encoded>
    </item>
    
    <item>
      <title>git学习笔记</title>
      <link>https://euds.org/2022/git%E5%AD%A6%E4%B9%A0%E7%AC%94%E8%AE%B0/</link>
      <pubDate>Sun, 04 Sep 2022 12:31:47 +0800</pubDate>
      
      <guid>https://euds.org/2022/git%E5%AD%A6%E4%B9%A0%E7%AC%94%E8%AE%B0/</guid>
      <description>记录git学习</description>
      <content:encoded><![CDATA[<h2 id="记录">记录</h2>
<h3 id="gitee配置的记录">Gitee配置的记录</h3>
<p>因为srtp项目是用gitee作托管，所以今天试着配置了下Gitee，还是花了些时间的，记录如下：</p>
<ol>
<li>主要参考的是<a href="https://cloud.tencent.com/developer/article/1774890"  target="_blank" rel="noopener" >Git同时配置Gitee和GitHub</a>,但它上面第一步就是让清除git的全局设置，有点不敢，因为怕清除后自己之前设置的一些东西出错。</li>
<li>又看了几个教程，发现<a href="https://blog.csdn.net/weixin_43894513/article/details/104550377"  target="_blank" rel="noopener" >Github 与 Gitee 共存配置</a>上并没有说要清楚全局设置，于是就跟着上面的一步步走，很顺利地就设置好了。</li>
<li>一个收获是<code>config</code>,<code>id_rsa</code>都是可以用记事本打开并编辑的。</li>
</ol>
<h3 id="多人协作时的流程">多人协作时的流程</h3>
<p>这次小组项目用的是华为云，所以流程也都是基于华为云来说的。</p>
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl"><span class="c1">#确定好本次代码开发所要完成的任务，开好远程分支x，相关信息(分支名称，描述，关联工作项）要注明好</span>
</span></span><span class="line"><span class="cl">git pull <span class="c1">#确保代码、分支是最新的</span>
</span></span><span class="line"><span class="cl">git checkout -b 本地分支名 origin/远程分支名x   <span class="c1">#检出远程的x分支到本地</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 代码开发</span>
</span></span><span class="line"><span class="cl">git add .
</span></span><span class="line"><span class="cl">git commit -m<span class="s2">&#34;{</span>$<span class="s2">适当的批注}&#34;</span>
</span></span><span class="line"><span class="cl">git push <span class="c1">#将代码推送到远程分支，开发过程中这个操作可以频繁点，好处是：代码备份和版本管理</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 完成本次代码开发所要完成的任务后（请确定功能实现，本地调试没问题）</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 接下来进行分支的合并 </span>
</span></span><span class="line"><span class="cl"><span class="c1"># 在华为云中新建合并请求（可设置检视人，评审人，让别人帮忙看看）</span>
</span></span><span class="line"><span class="cl"><span class="c1"># 合并完成后（默认设置是分支合并后，源分支是删除的）</span>
</span></span><span class="line"><span class="cl">git remote prune origin <span class="c1">#当华为云上显示远程分支已经删除，但git branch -r仍然看到所删除的分支，执行该命令</span>
</span></span><span class="line"><span class="cl">git checkout master <span class="c1">#切回master分支（一次任务完成后，建议切回master分支，这样pull的时候可以避免自己写的代码丢失的问题）</span>
</span></span><span class="line"><span class="cl">git branch -d <span class="o">{</span>$本地分支名<span class="o">}</span> <span class="c1">#删除本次任务所用的本地分支（也可以不删，当作备份）</span>
</span></span></code></pre></div><hr>
<h2 id="报错与解决">报错与解决</h2>
<ol>
<li>
<p>报错：</p>
<blockquote>
<p>Updates were rejected because the remote contains work that you donot have locally.</p>
</blockquote>
<ul>
<li><strong>场景</strong>:在尝试gitee的时候，先是建了个远程仓库。然后在本地新建了个同名的文件夹，然后
<pre tabindex="0"><code>git init 
git remote add origin https://gitee.com/spike23187/hello-gitee.git
</code></pre></li>
</ul>
<p>在文件夹里新建了个文件，<code>push</code>的时候报的错</p>
<ul>
<li><strong>解决</strong>: 根据下方的提示，是我没有先<code>pull</code>，本地文件不是最新的。</li>
</ul>
</li>
<li>
<blockquote>
<p>Updates were rejected because the tip of your current branch is behind its remote counterpart</p>
</blockquote>
<ul>
<li><strong>场景</strong>：上述那个场景中，<code>git pull origin master</code>后报的错</li>
<li><strong>解决</strong>：<code>git pull origin master --rebase</code></li>
<li><strong>参考链接</strong>：<a href="https://blog.csdn.net/weixin_42310154/article/details/118676936"  target="_blank" rel="noopener" >Git常见报错：Updates were rejected because the tip of your current branch is behind</a></li>
<li><strong>收获</strong>：虽然使用GitHub托管代码有段时间了，但一直是用插件简化操作的。这次算是第一次用git bash，就报了两个错，感觉git要用好，还是有段路要走的。</li>
</ul>
</li>
<li></li>
</ol>
<ul>
<li><strong>场景</strong>:push时报错,大意是网络问题</li>
<li><strong>解决</strong>：
<div class="highlight"><pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">   <span class="c1"># usually</span>
</span></span><span class="line"><span class="cl">   git config --global http.proxy <span class="s1">&#39;http://127.0.0.1:7890&#39;</span>
</span></span><span class="line"><span class="cl">   git config --global https.proxy <span class="s1">&#39;http://127.0.0.1:7890&#39;</span>
</span></span><span class="line"><span class="cl">   <span class="c1"># in wsl2 </span>
</span></span><span class="line"><span class="cl">   git config --global http.proxy <span class="s1">&#39;http://172.19.80.1:7890&#39;</span>
</span></span><span class="line"><span class="cl">   git config --global https.proxy <span class="s1">&#39;http://172.19.80.1:7890&#39;</span>
</span></span></code></pre></div></li>
</ul>
<hr>
<h2 id="使用技巧">使用技巧</h2>
<h3 id="github项目内搜索">Github项目内搜索</h3>
<p>在仓库页面上按 T ，然后直接输入文件名</p>
<hr>
<h1 id="可供参考的链接">可供参考的链接</h1>
<ul>
<li><a href="https://www.yiibai.com/git"  target="_blank" rel="noopener" >git教程</a></li>
<li><a href="https://www.theserverside.com/video/Git-reflog-vs-log-How-these-commit-history-tools-differ"  target="_blank" rel="noopener" >Git reflog vs. log: How these commit history tools differ</a></li>
<li><a href="http://blog.ch3nyang.top/miscellaneous/git%E5%AD%A6%E4%B9%A0/"  target="_blank" rel="noopener" >【杂】git学习</a></li>
<li><a href="https://zhuanlan.zhihu.com/p/137856034"  target="_blank" rel="noopener" >拜托，不要再问我Git如何回滚代码</a></li>
<li><a href="https://stackoverflow.com/questions/20106712/what-are-the-differences-between-git-remote-prune-git-prune-git-fetch-prune"  target="_blank" rel="noopener" >What are the differences between git remote prune, git prune, git fetch &ndash;prune, etc</a></li>
<li><a href="https://rehoni.github.io/cn/2019/2019-10-11-git-problems/"  target="_blank" rel="noopener" >Git实际问题</a></li>
<li><a href="https://jvns.ca/blog/2023/09/14/in-a-git-repository--where-do-your-files-live-/"  target="_blank" rel="noopener" >In a git repository, where do your files live?</a></li>
</ul>
]]></content:encoded>
    </item>
    
  </channel>
</rss>
