deploy: moranmore/blog@b989754

index.xml

@@ -510,12 +510,19 @@ data-flex-basis="522px"
 <div class="highlight"><div class="chroma">
 <table class="lntable"><tr><td class="lntd">
 <pre tabindex="0" class="chroma"><code><span class="lnt">1
+</span><span class="lnt">2
+</span><span class="lnt">3
 </span></code></pre></td>
 <td class="lntd">
-<pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git diff main origin/main <span class="c1"># 比较本地和远程仓库内容区别,如果没有结果就是ok</span>
+<pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git fetch <span class="c1"># 会在不更新本地仓库的情况下获取远程仓库的更新情况</span>
+</span></span><span class="line"><span class="cl">git diff --stat main origin/main <span class="c1"># 比较本地和远程仓库内容区别,如果没有结果就是ok，如果有区别，视情况选择merge</span>
+</span></span><span class="line"><span class="cl">git merge <span class="c1"># 将远程已经更新的内容更新到本地</span>
 </span></span></code></pre></td></tr></table>
 </div>
-</div><h1 id="参考">参考</h1>
+</div><p>参考：<a class="link" href="https://stackoverflow.com/questions/73338848/git-diff-show-nothing" target="_blank" rel="noopener"
+>如果git diff无反应怎么办</a></p>
+<p>到此就完成了两个主机上博客的更新部署，只不过需要在更新的时候先检查远程和本地的区别，然后再选择是否更新。</p>
+<h1 id="参考">参考</h1>
 <p>Hugo actions的指导：https://github.com/peaceiris/actions-hugo</p>
 <p>报错解决：https://www.youtube.com/watch?v=DMgEGpqXEM4</p>
 <p>主题gitmodules：https://github.com/gohugoio/hugoThemes/blob/master/.gitmodules</p>

p/hugo-githubpages-actions博客搭建/index.html

@@ -169,8 +169,12 @@
 </span></span></span></code></pre></td></tr></table></div></div><p>这样图片直接复制到当前文件夹就行了。</p><h2 id=双设备>双设备</h2><p>如果有两个不同系统的笔记本，比如一个Ubuntu和一个Windows，可以在两个设备上同时clone下来仓库，比如已经完成了另一个设备上的git安装，还没clone仓库到本地时候。</p><p>首先将私钥复制到用户目录的ssh文件中，然后在相关目录中直接：</p><div class=highlight><div class=chroma><table class=lntable><tr><td class=lntd><pre tabindex=0 class=chroma><code><span class=lnt>1
 </span></code></pre></td><td class=lntd><pre tabindex=0 class=chroma><code class=language-bash data-lang=bash><span class=line><span class=cl>git clone ......
 </span></span></code></pre></td></tr></table></div></div><p>发生更新之后，即使博客的更新只有一个人，但是仍然需要检查是不是相比仓库发生了更新，如在win上更新之后但是没有pull，但是mac端先pull 到主要分支，如果下次在win上直接pull而不比较内容，会出现覆盖mac端pull的情况，所以需要检测当前的版本是不是最新的，如果和远程仓库有区别需要先把远程仓库的更新拉到本地然后pull：</p><div class=highlight><div class=chroma><table class=lntable><tr><td class=lntd><pre tabindex=0 class=chroma><code><span class=lnt>1
-</span></code></pre></td><td class=lntd><pre tabindex=0 class=chroma><code class=language-bash data-lang=bash><span class=line><span class=cl>git diff main origin/main <span class=c1># 比较本地和远程仓库内容区别,如果没有结果就是ok</span>
-</span></span></code></pre></td></tr></table></div></div><h1 id=参考>参考</h1><p>Hugo actions的指导：https://github.com/peaceiris/actions-hugo</p><p>报错解决：https://www.youtube.com/watch?v=DMgEGpqXEM4</p><p>主题gitmodules：https://github.com/gohugoio/hugoThemes/blob/master/.gitmodules</p><p>标题无法从一级标题开始显示：https://huweim.github.io/post/blog_hugo_%E7%9B%AE%E5%BD%95%E7%BB%93%E6%9E%84/</p></section><footer class=article-footer><section class=article-copyright><svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-copyright" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentcolor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z"/><circle cx="12" cy="12" r="9"/><path d="M14.5 9a3.5 4 0 100 6"/></svg><span>Licensed under CC BY-NC-SA 4.0</span></section></footer></article><div class=disqus-container><div id=disqus_thread></div><script type=application/javascript>window.disqus_config=function(){},function(){if(["localhost","127.0.0.1"].indexOf(window.location.hostname)!=-1){document.getElementById("disqus_thread").innerHTML="Disqus comments not available by default when the website is previewed locally.";return}var t=document,e=t.createElement("script");e.async=!0,e.src="//moranmore.disqus.com/embed.js",e.setAttribute("data-timestamp",+new Date),(t.head||t.body).appendChild(e)}()</script><noscript>Please enable JavaScript to view the <a href=https://disqus.com/?ref_noscript>comments powered by Disqus.</a></noscript><a href=https://disqus.com class=dsq-brlink>comments powered by <span class=logo-disqus>Disqus</span></a></div><style>.disqus-container{background-color:var(--card-background);border-radius:var(--card-border-radius);box-shadow:var(--shadow-l1);padding:var(--card-padding)}</style><script>window.addEventListener("onColorSchemeChange",e=>{typeof DISQUS=="object"&&DISQUS.reset({reload:!0})})</script><footer class=site-footer><section class=copyright>&copy;
+</span><span class=lnt>2
+</span><span class=lnt>3
+</span></code></pre></td><td class=lntd><pre tabindex=0 class=chroma><code class=language-bash data-lang=bash><span class=line><span class=cl>git fetch <span class=c1># 会在不更新本地仓库的情况下获取远程仓库的更新情况</span>
+</span></span><span class=line><span class=cl>git diff --stat main origin/main <span class=c1># 比较本地和远程仓库内容区别,如果没有结果就是ok，如果有区别，视情况选择merge</span>
+</span></span><span class=line><span class=cl>git merge <span class=c1># 将远程已经更新的内容更新到本地</span>
+</span></span></code></pre></td></tr></table></div></div><p>参考：<a class=link href=https://stackoverflow.com/questions/73338848/git-diff-show-nothing target=_blank rel=noopener>如果git diff无反应怎么办</a></p><p>到此就完成了两个主机上博客的更新部署，只不过需要在更新的时候先检查远程和本地的区别，然后再选择是否更新。</p><h1 id=参考>参考</h1><p>Hugo actions的指导：https://github.com/peaceiris/actions-hugo</p><p>报错解决：https://www.youtube.com/watch?v=DMgEGpqXEM4</p><p>主题gitmodules：https://github.com/gohugoio/hugoThemes/blob/master/.gitmodules</p><p>标题无法从一级标题开始显示：https://huweim.github.io/post/blog_hugo_%E7%9B%AE%E5%BD%95%E7%BB%93%E6%9E%84/</p></section><footer class=article-footer><section class=article-copyright><svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-copyright" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentcolor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z"/><circle cx="12" cy="12" r="9"/><path d="M14.5 9a3.5 4 0 100 6"/></svg><span>Licensed under CC BY-NC-SA 4.0</span></section></footer></article><div class=disqus-container><div id=disqus_thread></div><script type=application/javascript>window.disqus_config=function(){},function(){if(["localhost","127.0.0.1"].indexOf(window.location.hostname)!=-1){document.getElementById("disqus_thread").innerHTML="Disqus comments not available by default when the website is previewed locally.";return}var t=document,e=t.createElement("script");e.async=!0,e.src="//moranmore.disqus.com/embed.js",e.setAttribute("data-timestamp",+new Date),(t.head||t.body).appendChild(e)}()</script><noscript>Please enable JavaScript to view the <a href=https://disqus.com/?ref_noscript>comments powered by Disqus.</a></noscript><a href=https://disqus.com class=dsq-brlink>comments powered by <span class=logo-disqus>Disqus</span></a></div><style>.disqus-container{background-color:var(--card-background);border-radius:var(--card-border-radius);box-shadow:var(--shadow-l1);padding:var(--card-padding)}</style><script>window.addEventListener("onColorSchemeChange",e=>{typeof DISQUS=="object"&&DISQUS.reset({reload:!0})})</script><footer class=site-footer><section class=copyright>&copy;
 2023 moranmore's site</section><section class=powerby>Built with <a href=https://gohugo.io/ target=_blank rel=noopener>Hugo</a><br>Theme <b><a href=https://github.com/CaiJimmy/hugo-theme-stack target=_blank rel=noopener data-version=3.16.0>Stack</a></b> designed by <a href=https://jimmycai.com target=_blank rel=noopener>Jimmy</a></section></footer><div class=pswp tabindex=-1 role=dialog aria-hidden=true><div class=pswp__bg></div><div class=pswp__scroll-wrap><div class=pswp__container><div class=pswp__item></div><div class=pswp__item></div><div class=pswp__item></div></div><div class="pswp__ui pswp__ui--hidden"><div class=pswp__top-bar><div class=pswp__counter></div><button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
 <button class="pswp__button pswp__button--share" title=Share></button>
 <button class="pswp__button pswp__button--fs" title="Toggle fullscreen"></button>

post/index.xml

@@ -510,12 +510,19 @@ data-flex-basis="522px"
 <div class="highlight"><div class="chroma">
 <table class="lntable"><tr><td class="lntd">
 <pre tabindex="0" class="chroma"><code><span class="lnt">1
+</span><span class="lnt">2
+</span><span class="lnt">3
 </span></code></pre></td>
 <td class="lntd">
-<pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git diff main origin/main <span class="c1"># 比较本地和远程仓库内容区别,如果没有结果就是ok</span>
+<pre tabindex="0" class="chroma"><code class="language-bash" data-lang="bash"><span class="line"><span class="cl">git fetch <span class="c1"># 会在不更新本地仓库的情况下获取远程仓库的更新情况</span>
+</span></span><span class="line"><span class="cl">git diff --stat main origin/main <span class="c1"># 比较本地和远程仓库内容区别,如果没有结果就是ok，如果有区别，视情况选择merge</span>
+</span></span><span class="line"><span class="cl">git merge <span class="c1"># 将远程已经更新的内容更新到本地</span>
 </span></span></code></pre></td></tr></table>
 </div>
-</div><h1 id="参考">参考</h1>
+</div><p>参考：<a class="link" href="https://stackoverflow.com/questions/73338848/git-diff-show-nothing" target="_blank" rel="noopener"
+>如果git diff无反应怎么办</a></p>
+<p>到此就完成了两个主机上博客的更新部署，只不过需要在更新的时候先检查远程和本地的区别，然后再选择是否更新。</p>
+<h1 id="参考">参考</h1>
 <p>Hugo actions的指导：https://github.com/peaceiris/actions-hugo</p>
 <p>报错解决：https://www.youtube.com/watch?v=DMgEGpqXEM4</p>
 <p>主题gitmodules：https://github.com/gohugoio/hugoThemes/blob/master/.gitmodules</p>