diff --git a/content/blog/Connect-to-GitHub-with-SSH-Keys/add-ssh-key-to-github.png b/content/blog/connect-to-github-with-ssh-keys/add-ssh-key-to-github.png similarity index 100% rename from content/blog/Connect-to-GitHub-with-SSH-Keys/add-ssh-key-to-github.png rename to content/blog/connect-to-github-with-ssh-keys/add-ssh-key-to-github.png diff --git a/content/blog/Connect-to-GitHub-with-SSH-Keys/index.zh-cn.md b/content/blog/connect-to-github-with-ssh-keys/index.zh-cn.md similarity index 100% rename from content/blog/Connect-to-GitHub-with-SSH-Keys/index.zh-cn.md rename to content/blog/connect-to-github-with-ssh-keys/index.zh-cn.md diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/create-a-github-repo.png b/content/blog/git-speedrun-guide-part-1-basics/create-a-github-repo.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/create-a-github-repo.png rename to content/blog/git-speedrun-guide-part-1-basics/create-a-github-repo.png diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/git-add-commit.png b/content/blog/git-speedrun-guide-part-1-basics/git-add-commit.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/git-add-commit.png rename to content/blog/git-speedrun-guide-part-1-basics/git-add-commit.png diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/git-add.png b/content/blog/git-speedrun-guide-part-1-basics/git-add.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/git-add.png rename to content/blog/git-speedrun-guide-part-1-basics/git-add.png diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/git-commit.png b/content/blog/git-speedrun-guide-part-1-basics/git-commit.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/git-commit.png rename to content/blog/git-speedrun-guide-part-1-basics/git-commit.png diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/git-init.png b/content/blog/git-speedrun-guide-part-1-basics/git-init.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/git-init.png rename to content/blog/git-speedrun-guide-part-1-basics/git-init.png diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/index.zh-cn.md b/content/blog/git-speedrun-guide-part-1-basics/index.zh-cn.md similarity index 94% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/index.zh-cn.md rename to content/blog/git-speedrun-guide-part-1-basics/index.zh-cn.md index e2e68f1..08346dd 100644 --- a/content/blog/Git-Speedrun-Guide-Part-1-Basics/index.zh-cn.md +++ b/content/blog/git-speedrun-guide-part-1-basics/index.zh-cn.md @@ -4,7 +4,7 @@ title: "Git 速通指南 | Part 1: 基础" ## 1. 安装 Git -参考文章: [安装 Git](https://shusct.github.io/wiki/blog/install-git/) . +参考文章: [安装 Git](../install-git) . > 📌 **注意** > 如果你是 Windows 用户, 由于这个 [Issue](https://github.com/gitextensions/gitextensions/issues/5073) 尚未被解决, 我们建议使用 Git Bash (而非 PowerShell) 执行 Git 命令. @@ -126,10 +126,10 @@ Fig.4 中的 Version 2 是当前项目的最新版本. ### 4.1. 基础工作流程 1. SSH 密钥连接 GitHub: [4.2. 利用 SSH 密钥链接 GitHub](#42-生成-ssh-密钥并连接-github) . -2. 已有本地储存库: +2. 若已有本地储存库: - [4.3. 创建一个 GitHub 储存库](#43-创建一个-github-储存库) . - [4.4. 关联本地储存库与远程储存库](#44-关联本地储存库与远程储存库) . -3. 已有远程储存库: +3. 若已有远程储存库: - [4.5. 直接 `clone` 远程储存库](#45-直接-clone-远程储存库) . **常用流程 1** - 本地更改 `push` 到远程储存库: @@ -157,7 +157,7 @@ git pull origin --no-rebase ### 4.2. 生成 SSH 密钥并连接 GitHub -参考文章: [利用 SSH 密钥链接 GitHub](https://shusct.github.io/wiki/blog/connect-to-github-with-ssh-keys/) . +参考文章: [利用 SSH 密钥链接 GitHub](../connect-to-github-with-ssh-keys/) . ### 4.3. 创建一个 GitHub 储存库 diff --git a/content/blog/Git-Speedrun-Guide-Part-1-Basics/repo-ssh-address.png b/content/blog/git-speedrun-guide-part-1-basics/repo-ssh-address.png similarity index 100% rename from content/blog/Git-Speedrun-Guide-Part-1-Basics/repo-ssh-address.png rename to content/blog/git-speedrun-guide-part-1-basics/repo-ssh-address.png diff --git a/content/blog/Git-Speedrun-Guide-Part-2-Branch-And-Submodule/index.zh-cn.md b/content/blog/git-speedrun-guide-part-2-branch-and-submodule/index.zh-cn.md similarity index 91% rename from content/blog/Git-Speedrun-Guide-Part-2-Branch-And-Submodule/index.zh-cn.md rename to content/blog/git-speedrun-guide-part-2-branch-and-submodule/index.zh-cn.md index 3eb847d..c964275 100644 --- a/content/blog/Git-Speedrun-Guide-Part-2-Branch-And-Submodule/index.zh-cn.md +++ b/content/blog/git-speedrun-guide-part-2-branch-and-submodule/index.zh-cn.md @@ -2,11 +2,11 @@ title: "Git 速通指南 | Part 2: 分支与子模块" --- -在 [Git 速通指南 | Part 1: 基础](https://shusct.github.io/wiki/blog/git-speedrun-guide-part-1-basics/) 中, 我们已经学习了如何创建 Git 储存库, 如何 `add` 和 `commit` 更改, 以及如何进行 `push` 以及 `pull` 操作. 本文将继续介绍 Git 的分支与子模块的使用. +在 [Git 速通指南 | Part 1: 基础](../git-speedrun-guide-part-1-basics/) 中, 我们已经学习了如何创建 Git 储存库, 如何 `add` 和 `commit` 更改, 以及如何进行 `push` 以及 `pull` 操作. 本文将继续介绍 Git 的分支与子模块的使用. ## 0. 准备工作 -请保证本地有一个与远程仓库关联的 Git 储存库. 如果没有, 请参考 [Git 速通指南 | Part 1: 基础](https://shusct.github.io/wiki/blog/git-speedrun-guide-part-1-basics/) 第 4 节创建一个远程储存库, 然后直接 `clone` 至本地. +请保证本地有一个与远程仓库关联的 Git 储存库. 如果没有, 请参考 [Git 速通指南 | Part 1: 基础](../git-speedrun-guide-part-1-basics/) 第 4 节创建一个远程储存库, 然后直接 `clone` 至本地. ## 1. 分支 diff --git a/content/blog/Git-Speedrun-Guide-Part-3-Contribute-as-a-Collaborator/index.zh-cn.md b/content/blog/git-speedrun-guide-part-3-contribute-as-a-collaborator/index.zh-cn.md similarity index 88% rename from content/blog/Git-Speedrun-Guide-Part-3-Contribute-as-a-Collaborator/index.zh-cn.md rename to content/blog/git-speedrun-guide-part-3-contribute-as-a-collaborator/index.zh-cn.md index 6e59f23..f76a84b 100644 --- a/content/blog/Git-Speedrun-Guide-Part-3-Contribute-as-a-Collaborator/index.zh-cn.md +++ b/content/blog/git-speedrun-guide-part-3-contribute-as-a-collaborator/index.zh-cn.md @@ -13,7 +13,7 @@ title: "Git 速通指南 | Part 3: 作为协作者贡献" ## 2. `clone` 项目仓库 -参考 [Git 速通指南 | Part 1: 基础 - 4. 远程储存库](https://shusct.github.io/wiki/blog/git-speedrun-guide-part-1-basics/#4-%e8%bf%9c%e7%a8%8b%e5%82%a8%e5%ad%98%e5%ba%93) 中的内容, 将项目仓库 `clone` 至本地. +参考 [Git 速通指南 | Part 1: 基础 - 4. 远程储存库](../git-speedrun-guide-part-1-basics/#4-远程-git-储存库) 中的内容, 将项目仓库 `clone` 至本地. ## 3. 查看 `issue` @@ -50,7 +50,7 @@ git switch

-参考 [Git 速通指南 | Part 1: 基础 - 1. 分支]() 创建新分支并推送至远程仓库. 例如, 如果你想解决 `issue #1` (关于支持 `std::format`), 你可以创建一个名为 `feature/#1-support-std-format` 的分支并推送至远程仓库; 参考以下命令: +参考 [Git 速通指南 | Part 2: 分支于子模块 - 1. 分支](../git-speedrun-guide-part-2-branch-and-submodule/#1-分支) 创建新分支并推送至远程仓库. 例如, 如果你想解决 `issue #1` (关于支持 `std::format`), 你可以创建一个名为 `feature/#1-support-std-format` 的分支并推送至远程仓库; 参考以下命令: ```bash # Switch to the target branch @@ -63,7 +63,7 @@ git push origin feature/#1-support-std-format:feature/#1-support-std-format ## 5. `push` 更改 -修改完成后, 请将更改 `add` 和 `commit` 到本地仓库, 接着先 `pull` 远程仓库的最新更改 (他人可能在你提交之前 `push` 到了你正在工作的分支, 你需要 `pull` 下来进行可能的[冲突处理]()), 然后再 `push` 你的更改至远程仓库: +修改完成后, 请将更改 `add` 和 `commit` 到本地仓库, 接着先 `pull` 远程仓库的最新更改 (他人可能在你提交之前 `push` 到了你正在工作的分支, 你需要 `pull` 下来进行可能的[冲突处理](../git-speedrun-guide-part-2-branch-and-submodule/#13-冲突处理)), 然后再 `push` 你的更改至远程仓库: ```bash # Add local changes to the staged area diff --git a/content/blog/Install-Git/index.zh-cn.md b/content/blog/install-git/index.zh-cn.md similarity index 72% rename from content/blog/Install-Git/index.zh-cn.md rename to content/blog/install-git/index.zh-cn.md index 49955c1..135b85c 100644 --- a/content/blog/Install-Git/index.zh-cn.md +++ b/content/blog/install-git/index.zh-cn.md @@ -12,7 +12,7 @@ sudo apt install git ## 2. 在 Windows 上安装 Git -安装 Scoop (参考: [在 Windows 上安装 Scoop](https://shusct.github.io/wiki/blog/install-scoop-on-windows/)) 后, 在终端中运行以下命令以安装 Git: +安装 Scoop (参考: [在 Windows 上安装 Scoop](../install-scoop-on-windows/)) 后, 在终端中运行以下命令以安装 Git: ```powershell scoop install main/git diff --git a/content/blog/Install-Scoop-on-Windows/index.zh-cn.md b/content/blog/install-scoop-on-windows/index.zh-cn.md similarity index 100% rename from content/blog/Install-Scoop-on-Windows/index.zh-cn.md rename to content/blog/install-scoop-on-windows/index.zh-cn.md diff --git a/content/blog/Install-Scoop-on-Windows/pwsh-settings.png b/content/blog/install-scoop-on-windows/pwsh-settings.png similarity index 100% rename from content/blog/Install-Scoop-on-Windows/pwsh-settings.png rename to content/blog/install-scoop-on-windows/pwsh-settings.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/check_ram.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/check_ram.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/check_ram.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/check_ram.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/clean_disk.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/clean_disk.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/clean_disk.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/clean_disk.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/disk_manager.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/disk_manager.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/disk_manager.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/disk_manager.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/download_ubuntu_iso.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/download_ubuntu_iso.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/download_ubuntu_iso.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/download_ubuntu_iso.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/hp_boot.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/hp_boot.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/hp_boot.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/hp_boot.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_cuda_toolkit.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_cuda_toolkit.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_cuda_toolkit.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_cuda_toolkit.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_cuda_toolkit_2.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_cuda_toolkit_2.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_cuda_toolkit_2.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_cuda_toolkit_2.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_ubuntu_1.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_ubuntu_1.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_ubuntu_1.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_ubuntu_1.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_ubuntu_2.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_ubuntu_2.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/install_ubuntu_2.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/install_ubuntu_2.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/lenovo_boot.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/lenovo_boot.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/lenovo_boot.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/lenovo_boot.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/nvidia_driver.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/nvidia_driver.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/nvidia_driver.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/nvidia_driver.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/reset_windows.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/reset_windows.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/reset_windows.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/reset_windows.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/see_out_alter_downloads.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/see_out_alter_downloads.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/see_out_alter_downloads.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/see_out_alter_downloads.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/shrink_disk.png b/content/blog/reset-windows-and-install-ubuntu-alongside/imgs/shrink_disk.png similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/imgs/shrink_disk.png rename to content/blog/reset-windows-and-install-ubuntu-alongside/imgs/shrink_disk.png diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/index.zh-cn.md b/content/blog/reset-windows-and-install-ubuntu-alongside/index.zh-cn.md similarity index 98% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/index.zh-cn.md rename to content/blog/reset-windows-and-install-ubuntu-alongside/index.zh-cn.md index edd8437..74c027c 100644 --- a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/index.zh-cn.md +++ b/content/blog/reset-windows-and-install-ubuntu-alongside/index.zh-cn.md @@ -15,6 +15,8 @@ title: 重置 Windows 并且安装 Ubuntu 双系统 ## 2. 下载 Ubuntu Desktop +> 💬 目前 Ubuntu 24.04 LTS 已经发布, LOGO 是大家最爱的鼠鼠, 感兴趣的同学可以参考本文安装 Ubuntu 24 哦~ + 进入 https://ubuntu.com/download/desktop . Ubuntu 23 比较好看, 所以接下来我准备下载 23. 你也可以选择下载 22. diff --git a/content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/vimrc b/content/blog/reset-windows-and-install-ubuntu-alongside/vimrc similarity index 100% rename from content/blog/Reset-Windows-And-Install-Ubuntu-Alongside/vimrc rename to content/blog/reset-windows-and-install-ubuntu-alongside/vimrc