https://blog.darven.top/tags/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/Recent content in 版本控制 on darcyjovenHugo -- gohugo.iozhWed, 14 Oct 2026 02:12:00 +0000https://blog.darven.top/p/git-stash-shi-yong/Wed, 14 Oct 2026 00:00:00 +0000https://blog.darven.top/p/git-stash-shi-yong/<ul> <li>git stash 是储藏的意思 <em>[图片：Pasted image 20260518091044.png]</em></li> </ul> <p>本地代码落后远程一此commit，但是本地又修改了代码，不希望本地增加一次提交，可以使用git stash。</p> <p>git stash 是将本地修改的内容暂时保存，当远程同步后，再将暂时保存的内容取出修改。</p> <p><img alt="Pasted image 20260518091114.png" loading="lazy" sizes="(max-width: 767px) calc(100vw - 30px), (max-width: 1023px) 700px, (max-width: 1279px) 950px, 1232px" src="https://blog.darven.top/images/2b211076-00.png"></p> <blockquote> <p>这时本地修改的未提交内容，已经保存下来了。</p> </blockquote> <p><img alt="Pasted image 20260518091131.png" loading="lazy" sizes="(max-width: 767px) calc(100vw - 30px), (max-width: 1023px) 700px, (max-width: 1279px) 950px, 1232px" src="https://blog.darven.top/images/2b211076-01.png"></p> <blockquote> <p>再次查看，本地没有修改内容，可以直接拉去远程合并到本地。</p> </blockquote> <p><img alt="Pasted image 20260518091144.png" loading="lazy" sizes="(max-width: 767px) calc(100vw - 30px), (max-width: 1023px) 700px, (max-width: 1279px) 950px, 1232px" src="https://blog.darven.top/images/2b211076-02.png"></p> <blockquote> <p>拉取成功</p> </blockquote> <p><em>[图片：Pasted image 20260518091156.png]</em></p> <blockquote> <p>git stash pop 取出最近一次暂存代码</p> </blockquote> <p>再次查看已经没有差异</p> <p><img alt="Pasted image 20260518091214.png" loading="lazy" sizes="(max-width: 767px) calc(100vw - 30px), (max-width: 1023px) 700px, (max-width: 1279px) 950px, 1232px" src="https://blog.darven.top/images/2b211076-03.png"></p>