add new content

a-fly-fly-bird · Dec 16, 2023 · 00db82d · 00db82d
1 parent c1eb089
commit 00db82d
Show file tree

Hide file tree

Showing 130 changed files with 14,176 additions and 800 deletions.
diff --git a/content/posts/2023/git-handbook/index.md b/content/posts/2023/git-handbook/index.md
@@ -2,7 +2,7 @@
 title = 'Git Handbook'
 date = 2023-12-15T22:49:08+08:00
 draft = false
-categories = ['后段']
+categories = ['后端']
 tags = ['Git']
 +++
 
@@ -56,6 +56,7 @@ git push
 详情参考：[revert-a-faulty-merge.txt](https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt)
 
 ### -m parent-number 配置项
+
 配置参考自：[git cherry-pick 教程](https://www.ruanyifeng.com/blog/2020/04/git-cherry-pick.html)
 
 > 如果原始提交是一个合并节点，来自于两个分支的合并，那么 Cherry pick 默认将失败，因为它不知道应该采用哪个分支的代码变动。
@@ -65,12 +66,14 @@ git push
 > 一般来说，1号父分支是接受变动的分支（the branch being merged into），2号父分支是作为变动来源的分支（the branch being merged from）。
 
 # 查看分支非最新的版本
+
 注意，是仅查看，不要修改。
 ```sh
 git checkout <commit>
 ```
 
 # 回到上一个分支
+
 我们经常会切到其他分支，简单操作又切回dev分支。最简单的方法是：
 
 ```sh
@@ -80,14 +83,24 @@ git checkout -
 # 但是推荐使用switch做分支的切换。
 ```
 # merge remote的代码到当前分支
+
 git pull 其实就是 git fetch 和 git merge FETCH_HEAD 的简写。
 ```sh
 git pull origin [remote-branch-name]
 ```
 比如
 ```sh
 git pull origin master
-```
+```·
 将远程主机 origin 的 master 分支拉取过来，与本地的当前所在分支合并。
 
+# git 合并本地多个提交为一个提交并推送到远程
+
+假设你需要merge前三个commit为一个单一的commit，运行如下命令：
+```sh
+git rebase -i HEAD~3
+```
+然后会进入一个界面，将除了第一个提交之外的`pick`改成`squash`，保存，然后修改提交信息即可。细节可以参考：[Combining Multiple Commits Into One Prior To Push](https://stackoverflow.com/a/5721879)
 
+# git 本地分支管理
+git 远程从主分支新建一个feature/fix分支后，本地克隆下来，然后最好不要直接就在这个分支上开始开发，把这个分支想象成自己的主分支，再新建分支进行开发，有时候会省很多事。
diff --git a/docs/404.html b/docs/404.html
@@ -26,8 +26,8 @@
 
 
 
-  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.4d4b1b35ed4fb37d198f5f4fa732e64404b535101cdef4401ac22e7c91380b82f3c8e5d51ae61f0149e6a95694c77e5a40943ca8480609a230c10f33c1fc11b4.css"
-    integrity="sha512-TUsbNe1Ps30Zj19PpzLmRAS1NRAc3vRAGsIufJE4C4LzyOXVGuYfAUnmqVaUx35aQJQ8qEgGCaIwwQ8zwfwRtA==" />
+  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.2b8b793b5350f23c027e845b237b267c85c08a4a6128dfad2b43b25f354c42eb4629bb7f88b75e09b52056c28e0d057594a8185bd540bd7bece42b3be6399cdf.css"
+    integrity="sha512-K4t5O1NQ8jwCfoRbI3smfIXAikphKN&#43;tK0OyXzVMQutGKbt/iLdeCbUgVsKODQV1lKgYW9VAvXvs5Cs75jmc3w==" />
 
 
   <script type="text/javascript" src="/js/appearance.min.516a16745bea5a9bd011138d254cc0fd3973cd55ce6e15f3dec763e7c7c2c7448f8fe7b54cca811cb821b0c7e12cd161caace1dd794ac3d34d40937cbcc9ee12.js"
@@ -44,12 +44,14 @@
 
 
 
-  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.0cd7e2013453119b477e6f3343b9ceeacb78e39e9cbcec5babfb48ac185d56af31e39ae5ea0b92ad40b61db0e46bfe7c10a2fc7ff687b6d38fb40ad4b8ba237d.js"
-    integrity="sha512-DNfiATRTEZtHfm8zQ7nO6st4456cvOxbq/tIrBhdVq8x45rl6guSrUC2HbDka/58EKL8f/aHttOPtArUuLojfQ==" data-copy="" data-copied=""></script>
+  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.6c7ae15a14b4f78dc4f6e7f92e5a4e05d69a1eafe594e439255e5f72defe4531e8fda36f83cf9730e27868220649112476686eec9d28c582deaabe019c419dbd.js"
+    integrity="sha512-bHrhWhS0943E9uf5LlpOBdaaHq/llOQ5JV5fct7&#43;RTHo/aNvg8&#43;XMOJ4aCIGSREkdmhu7J0oxYLeqr4BnEGdvQ==" data-copy="" data-copied=""></script>
+
 
   <script src="/js/zoom.min.js"></script>
 
 
+
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
@@ -141,8 +143,9 @@
     <div class="flex flex-1 items-center justify-between">
         <nav class="flex space-x-3">
 
+
             <a href="/" class="text-base font-medium text-gray-500 hover:text-gray-900">浮生日记</a>
-
+            
 
         </nav>
         <nav class="hidden md:flex items-center space-x-5 md:ml-12 h-12">
@@ -302,6 +305,7 @@
 
         <label id="menu-button" for="menu-controller" class="block">
             <input type="checkbox" id="menu-controller" class="hidden" />
+
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
 
 
@@ -330,7 +334,6 @@
                     </li>
 
 
-
 
 
   <li class="mt-1">
@@ -401,10 +404,10 @@
 
 
 
-
 
                 </ul>
 
+
 
             </div>
         </label>
@@ -475,7 +478,7 @@ <h1 class="mb-3 text-4xl font-extrabold">Page Not Found 😕</h1>
   </script>
 
 
-  <script type="text/javascript" src="/js/process.min.35c1113bcc16c5a59bf031082f9e63822aa95280423881a7847a7ff33a16e6299ce6a840d9ef4e10d947e030a18f3f20359afb2ec0f35967484b9a9360ac3145.js" integrity="sha512-NcERO8wWxaWb8DEIL55jgiqpUoBCOIGnhHp/8zoW5imc5qhA2e9OENlH4DChjz8gNZr7LsDzWWdIS5qTYKwxRQ=="></script>
+  <script type="text/javascript" src="/js/process.min.62060bb247f4de2b6dde45903668fefb68d792f365587605177b1227c0cf43588701edaca0cb40e2c8e2789bd5ce67c1d2a215b9fb258c3496a7cd25e7cb5fdf.js" integrity="sha512-YgYLskf03itt3kWQNmj&#43;&#43;2jXkvNlWHYFF3sSJ8DPQ1iHAe2soMtA4sjieJvVzmfB0qIVufsljDSWp80l58tf3w=="></script>
 
 
 </footer><div

diff --git a/docs/about/index.html b/docs/about/index.html
@@ -26,8 +26,8 @@
 
 
 
-  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.4d4b1b35ed4fb37d198f5f4fa732e64404b535101cdef4401ac22e7c91380b82f3c8e5d51ae61f0149e6a95694c77e5a40943ca8480609a230c10f33c1fc11b4.css"
-    integrity="sha512-TUsbNe1Ps30Zj19PpzLmRAS1NRAc3vRAGsIufJE4C4LzyOXVGuYfAUnmqVaUx35aQJQ8qEgGCaIwwQ8zwfwRtA==" />
+  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.2b8b793b5350f23c027e845b237b267c85c08a4a6128dfad2b43b25f354c42eb4629bb7f88b75e09b52056c28e0d057594a8185bd540bd7bece42b3be6399cdf.css"
+    integrity="sha512-K4t5O1NQ8jwCfoRbI3smfIXAikphKN&#43;tK0OyXzVMQutGKbt/iLdeCbUgVsKODQV1lKgYW9VAvXvs5Cs75jmc3w==" />
 
 
   <script type="text/javascript" src="/js/appearance.min.516a16745bea5a9bd011138d254cc0fd3973cd55ce6e15f3dec763e7c7c2c7448f8fe7b54cca811cb821b0c7e12cd161caace1dd794ac3d34d40937cbcc9ee12.js"
@@ -44,12 +44,14 @@
 
 
 
-  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.0cd7e2013453119b477e6f3343b9ceeacb78e39e9cbcec5babfb48ac185d56af31e39ae5ea0b92ad40b61db0e46bfe7c10a2fc7ff687b6d38fb40ad4b8ba237d.js"
-    integrity="sha512-DNfiATRTEZtHfm8zQ7nO6st4456cvOxbq/tIrBhdVq8x45rl6guSrUC2HbDka/58EKL8f/aHttOPtArUuLojfQ==" data-copy="" data-copied=""></script>
+  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.6c7ae15a14b4f78dc4f6e7f92e5a4e05d69a1eafe594e439255e5f72defe4531e8fda36f83cf9730e27868220649112476686eec9d28c582deaabe019c419dbd.js"
+    integrity="sha512-bHrhWhS0943E9uf5LlpOBdaaHq/llOQ5JV5fct7&#43;RTHo/aNvg8&#43;XMOJ4aCIGSREkdmhu7J0oxYLeqr4BnEGdvQ==" data-copy="" data-copied=""></script>
+
 
   <script src="/js/zoom.min.js"></script>
 
 
+
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
@@ -170,8 +172,9 @@
     <div class="flex flex-1 items-center justify-between">
         <nav class="flex space-x-3">
 
+
             <a href="/" class="text-base font-medium text-gray-500 hover:text-gray-900">浮生日记</a>
-
+            
 
         </nav>
         <nav class="hidden md:flex items-center space-x-5 md:ml-12 h-12">
@@ -331,6 +334,7 @@
 
         <label id="menu-button" for="menu-controller" class="block">
             <input type="checkbox" id="menu-controller" class="hidden" />
+
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
 
 
@@ -359,7 +363,6 @@
                     </li>
 
 
-
 
 
   <li class="mt-1">
@@ -430,10 +433,10 @@
 
 
 
-
 
                 </ul>
 
+
 
             </div>
         </label>
@@ -506,7 +509,7 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
 
 
 
-<div class="flex flex-row flex-wrap items-center">
+<div style="cursor: default;" class="flex flex-row flex-wrap items-center">
 
 
   <time datetime="2023-10-07 21:26:50 &#43;0800 CST">7 October 2023</time><span class="px-2 text-primary-500">&middot;</span><span>36 words</span><span class="px-2 text-primary-500">&middot;</span><span title="Reading time">1 min</span>
@@ -678,7 +681,7 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
       </script>
 
 
-      <script type="text/javascript" src="/js/page.min.0e49973b4ad0a382c7c6012d8bff8226316642daabc4f8a20477bd08674f3da6e2fa993bc20ad4f51e7c5bb68e6f913a207a7c4fe37ea0e7b806894afce0a64e.js" integrity="sha512-DkmXO0rQo4LHxgEti/&#43;CJjFmQtqrxPiiBHe9CGdPPabi&#43;pk7wgrU9R58W7aOb5E6IHp8T&#43;N&#43;oOe4BolK/OCmTg=="></script>
+      <script type="text/javascript" src="/js/page.min.5b1bad196a6075a1e11bae1dc95f24f67b610948a00525e347566c5a62338ea78f1c7224ab9a53873dcdb2a1a7d7d391b8a8ef45561297f68806c01315b0c4f6.js" integrity="sha512-WxutGWpgdaHhG64dyV8k9nthCUigBSXjR1ZsWmIzjqePHHIkq5pThz3NsqGn19ORuKjvRVYSl/aIBsATFbDE9g=="></script>
 
     </section>
   <footer class="pt-8 max-w-prose print:hidden">
@@ -735,7 +738,7 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
   </script>
 
 
-  <script type="text/javascript" src="/js/process.min.35c1113bcc16c5a59bf031082f9e63822aa95280423881a7847a7ff33a16e6299ce6a840d9ef4e10d947e030a18f3f20359afb2ec0f35967484b9a9360ac3145.js" integrity="sha512-NcERO8wWxaWb8DEIL55jgiqpUoBCOIGnhHp/8zoW5imc5qhA2e9OENlH4DChjz8gNZr7LsDzWWdIS5qTYKwxRQ=="></script>
+  <script type="text/javascript" src="/js/process.min.62060bb247f4de2b6dde45903668fefb68d792f365587605177b1227c0cf43588701edaca0cb40e2c8e2789bd5ce67c1d2a215b9fb258c3496a7cd25e7cb5fdf.js" integrity="sha512-YgYLskf03itt3kWQNmj&#43;&#43;2jXkvNlWHYFF3sSJ8DPQ1iHAe2soMtA4sjieJvVzmfB0qIVufsljDSWp80l58tf3w=="></script>
 
 
 </footer><div

diff --git a/docs/authors/index.html b/docs/authors/index.html
@@ -28,8 +28,8 @@
 
 
 
-  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.4d4b1b35ed4fb37d198f5f4fa732e64404b535101cdef4401ac22e7c91380b82f3c8e5d51ae61f0149e6a95694c77e5a40943ca8480609a230c10f33c1fc11b4.css"
-    integrity="sha512-TUsbNe1Ps30Zj19PpzLmRAS1NRAc3vRAGsIufJE4C4LzyOXVGuYfAUnmqVaUx35aQJQ8qEgGCaIwwQ8zwfwRtA==" />
+  <link type="text/css" rel="stylesheet" href="/css/main.bundle.min.2b8b793b5350f23c027e845b237b267c85c08a4a6128dfad2b43b25f354c42eb4629bb7f88b75e09b52056c28e0d057594a8185bd540bd7bece42b3be6399cdf.css"
+    integrity="sha512-K4t5O1NQ8jwCfoRbI3smfIXAikphKN&#43;tK0OyXzVMQutGKbt/iLdeCbUgVsKODQV1lKgYW9VAvXvs5Cs75jmc3w==" />
 
 
   <script type="text/javascript" src="/js/appearance.min.516a16745bea5a9bd011138d254cc0fd3973cd55ce6e15f3dec763e7c7c2c7448f8fe7b54cca811cb821b0c7e12cd161caace1dd794ac3d34d40937cbcc9ee12.js"
@@ -46,12 +46,14 @@
 
 
 
-  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.0cd7e2013453119b477e6f3343b9ceeacb78e39e9cbcec5babfb48ac185d56af31e39ae5ea0b92ad40b61db0e46bfe7c10a2fc7ff687b6d38fb40ad4b8ba237d.js"
-    integrity="sha512-DNfiATRTEZtHfm8zQ7nO6st4456cvOxbq/tIrBhdVq8x45rl6guSrUC2HbDka/58EKL8f/aHttOPtArUuLojfQ==" data-copy="" data-copied=""></script>
+  <script defer type="text/javascript" id="script-bundle" src="/js/main.bundle.min.6c7ae15a14b4f78dc4f6e7f92e5a4e05d69a1eafe594e439255e5f72defe4531e8fda36f83cf9730e27868220649112476686eec9d28c582deaabe019c419dbd.js"
+    integrity="sha512-bHrhWhS0943E9uf5LlpOBdaaHq/llOQ5JV5fct7&#43;RTHo/aNvg8&#43;XMOJ4aCIGSREkdmhu7J0oxYLeqr4BnEGdvQ==" data-copy="" data-copied=""></script>
+
 
   <script src="/js/zoom.min.js"></script>
 
 
+
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
@@ -143,8 +145,9 @@
     <div class="flex flex-1 items-center justify-between">
         <nav class="flex space-x-3">
 
+
             <a href="/" class="text-base font-medium text-gray-500 hover:text-gray-900">浮生日记</a>
-
+            
 
         </nav>
         <nav class="hidden md:flex items-center space-x-5 md:ml-12 h-12">
@@ -304,6 +307,7 @@
 
         <label id="menu-button" for="menu-controller" class="block">
             <input type="checkbox" id="menu-controller" class="hidden" />
+
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
 
 
@@ -332,7 +336,6 @@
                     </li>
 
 
-
 
 
   <li class="mt-1">
@@ -403,10 +406,10 @@
 
 
 
-
 
                 </ul>
 
+
 
             </div>
         </label>
@@ -476,7 +479,7 @@ <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral">Auth
   </script>
 
 
-  <script type="text/javascript" src="/js/page.min.0e49973b4ad0a382c7c6012d8bff8226316642daabc4f8a20477bd08674f3da6e2fa993bc20ad4f51e7c5bb68e6f913a207a7c4fe37ea0e7b806894afce0a64e.js" integrity="sha512-DkmXO0rQo4LHxgEti/&#43;CJjFmQtqrxPiiBHe9CGdPPabi&#43;pk7wgrU9R58W7aOb5E6IHp8T&#43;N&#43;oOe4BolK/OCmTg=="></script>
+  <script type="text/javascript" src="/js/page.min.5b1bad196a6075a1e11bae1dc95f24f67b610948a00525e347566c5a62338ea78f1c7224ab9a53873dcdb2a1a7d7d391b8a8ef45561297f68806c01315b0c4f6.js" integrity="sha512-WxutGWpgdaHhG64dyV8k9nthCUigBSXjR1ZsWmIzjqePHHIkq5pThz3NsqGn19ORuKjvRVYSl/aIBsATFbDE9g=="></script>
 
 
 
@@ -527,7 +530,7 @@ <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral">Auth
   </script>
 
 
-  <script type="text/javascript" src="/js/process.min.35c1113bcc16c5a59bf031082f9e63822aa95280423881a7847a7ff33a16e6299ce6a840d9ef4e10d947e030a18f3f20359afb2ec0f35967484b9a9360ac3145.js" integrity="sha512-NcERO8wWxaWb8DEIL55jgiqpUoBCOIGnhHp/8zoW5imc5qhA2e9OENlH4DChjz8gNZr7LsDzWWdIS5qTYKwxRQ=="></script>
+  <script type="text/javascript" src="/js/process.min.62060bb247f4de2b6dde45903668fefb68d792f365587605177b1227c0cf43588701edaca0cb40e2c8e2789bd5ce67c1d2a215b9fb258c3496a7cd25e7cb5fdf.js" integrity="sha512-YgYLskf03itt3kWQNmj&#43;&#43;2jXkvNlWHYFF3sSJ8DPQ1iHAe2soMtA4sjieJvVzmfB0qIVufsljDSWp80l58tf3w=="></script>
 
 
 </footer><div