https://skyseraph.github.io/tags/git/Recent content in Git on SkySeraphHugozh-CNTue, 01 Dec 2015 00:00:00 +0000https://skyseraph.github.io/posts/2015/git-workflow-best-practices/Tue, 01 Dec 2015 00:00:00 +0000https://skyseraph.github.io/posts/2015/git-workflow-best-practices/<blockquote> <p>作者：skyseraph<br> 日期：2015-12-01<br> 原文链接：<a href="https://skyseraph.github.io/posts/2015/git-workflow-best-practices/">Git 工作流最佳实践</a></p> </blockquote> <hr> <h2 id="分支策略">分支策略</h2> <p>推荐使用 Git Flow 或简化版的 GitHub Flow：</p> <pre tabindex="0"><code>main # 生产分支，始终可部署 develop # 开发分支 feature/* # 功能分支 hotfix/* # 紧急修复 </code></pre><h2 id="提交规范">提交规范</h2> <p>遵循 <a href="https://www.conventionalcommits.org/">Conventional Commits</a>：</p> <pre tabindex="0"><code>feat: 新增用户登录功能 fix: 修复首页加载闪烁问题 docs: 更新 README refactor: 重构认证模块 chore: 升级依赖版本 </code></pre><h2 id="常用命令速查">常用命令速查</h2> <div class="highlight"><div style="color:#f8f8f2;background-color:#282a36;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-text-size-adjust:none;"> <table style="border-spacing:0;padding:0;margin:0;border:0;"><tr><td style="vertical-align:top;padding:0;margin:0;border:0;"> <pre tabindex="0" style="color:#f8f8f2;background-color:#282a36;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-text-size-adjust:none;"><code><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 1 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 2 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 3 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 4 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 5 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 6 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 7 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 8 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 9 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">10 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">11 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">12 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">13 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">14 </span><span style="white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">15 </span></code></pre></td> <td style="vertical-align:top;padding:0;margin:0;border:0;;width:100%"> <pre tabindex="0" style="color:#f8f8f2;background-color:#282a36;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-text-size-adjust:none;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span><span style="color:#6272a4"># 查看简洁日志</span> </span></span><span style="display:flex;"><span>git log --oneline --graph --all </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#6272a4"># 交互式暂存</span> </span></span><span style="display:flex;"><span>git add -p </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#6272a4"># 修改最近一次提交</span> </span></span><span style="display:flex;"><span>git commit --amend --no-edit </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#6272a4"># 撤销工作区修改</span> </span></span><span style="display:flex;"><span>git restore &lt;file&gt; </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#6272a4"># 储藏当前修改</span> </span></span><span style="display:flex;"><span>git stash push -m <span style="color:#f1fa8c">&#34;描述&#34;</span> </span></span><span style="display:flex;"><span>git stash pop </span></span></code></pre></td></tr></table> </div> </div><h2 id="gitignore-模板">.gitignore 模板</h2> <pre tabindex="0"><code class="language-gitignore" data-lang="gitignore"># Hugo public/ resources/ .hugo_build.lock # OS .DS_Store Thumbs.db # Editor .vscode/ .idea/ *.swp </code></pre><h2 id="小结">小结</h2> <p>好的 Git 习惯能大幅降低协作成本，提交信息写清楚，未来的自己会感谢你。</p>