From 6524dc6d7b70f16f479a249916e70f14a6ddfd62 Mon Sep 17 00:00:00 2001 From: Jackylee Date: Fri, 26 Jul 2024 21:52:45 +0800 Subject: [PATCH] =?UTF-8?q?joyful=20pandas=20=E5=92=8C=20rime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/posts/github/joyful-pandas/index.md | 6 +++--- .../posts/rime/how-to-set-up-rime/index.md | 20 ++++++++++++++++++ .../assets/override-local-change.png | Bin .../assets/stash-apply-pop.png | Bin .../assets/stash-graph.png | Bin .../{git-scenario => git-situation}/index.md | 16 +++++++++++++- 6 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 content/posts/rime/how-to-set-up-rime/index.md rename content/posts/tools/{git-scenario => git-situation}/assets/override-local-change.png (100%) rename content/posts/tools/{git-scenario => git-situation}/assets/stash-apply-pop.png (100%) rename content/posts/tools/{git-scenario => git-situation}/assets/stash-graph.png (100%) rename content/posts/tools/{git-scenario => git-situation}/index.md (90%) diff --git a/content/posts/github/joyful-pandas/index.md b/content/posts/github/joyful-pandas/index.md index 3356784..294aaf0 100644 --- a/content/posts/github/joyful-pandas/index.md +++ b/content/posts/github/joyful-pandas/index.md @@ -1,10 +1,10 @@ --- -title: joyful-pandas 仓库 +title: Github开源项目 Joyful Pandas 阅读笔记 date: 2024-04-06T00:52:55+08:00 draft: true author: JackyLee -tags: [] -categories: ["Github", "教程"] +tags: ["python"] +categories: ["github", "教程"] comment: true --- diff --git a/content/posts/rime/how-to-set-up-rime/index.md b/content/posts/rime/how-to-set-up-rime/index.md new file mode 100644 index 0000000..a16af06 --- /dev/null +++ b/content/posts/rime/how-to-set-up-rime/index.md @@ -0,0 +1,20 @@ +--- +title: How to Set Up Rime +date: 2024-04-19T00:11:05+08:00 +draft: true +author: JackyLee +tags: [rime, c, c++] +categories: [输入法] +comment: true +--- + +## Rime + +### 小狼毫 + +一些问题:如何取消 ctrl+grave 的快捷键 +如何切换 ascii mode +雾凇输入法的配置 +vscode 的 vim 模式 +[weasel.yaml 速查 · rime/weasel Wiki](https://github.com/rime/weasel/wiki/weasel.yaml-%E9%80%9F%E6%9F%A5) +mac 上要怎么配置 diff --git a/content/posts/tools/git-scenario/assets/override-local-change.png b/content/posts/tools/git-situation/assets/override-local-change.png similarity index 100% rename from content/posts/tools/git-scenario/assets/override-local-change.png rename to content/posts/tools/git-situation/assets/override-local-change.png diff --git a/content/posts/tools/git-scenario/assets/stash-apply-pop.png b/content/posts/tools/git-situation/assets/stash-apply-pop.png similarity index 100% rename from content/posts/tools/git-scenario/assets/stash-apply-pop.png rename to content/posts/tools/git-situation/assets/stash-apply-pop.png diff --git a/content/posts/tools/git-scenario/assets/stash-graph.png b/content/posts/tools/git-situation/assets/stash-graph.png similarity index 100% rename from content/posts/tools/git-scenario/assets/stash-graph.png rename to content/posts/tools/git-situation/assets/stash-graph.png diff --git a/content/posts/tools/git-scenario/index.md b/content/posts/tools/git-situation/index.md similarity index 90% rename from content/posts/tools/git-scenario/index.md rename to content/posts/tools/git-situation/index.md index 3b2d1d9..e6fa005 100644 --- a/content/posts/tools/git-scenario/index.md +++ b/content/posts/tools/git-situation/index.md @@ -67,6 +67,20 @@ Warning: 使用完 stash 后,并没有形成一个提交 ## 2 远程分支相关 +### 2.1 克隆指定分支 + +```shell +git clone [git-repo] -b [branch-name] +# 或者 +git clone -b [branch-name] [git-repo] +``` + +### 2.2 clone 时选择 http 协议 和 ssh/git 协议 的区别 + +http: 无需身份验证 + +ssh: 需要 ssh 密钥 + ### 2.1 删除远程分支 远程分支已删除,本地仍然保留远程分支,如何清理过期的分支 @@ -79,7 +93,7 @@ git remote prune origin ### 2.2 gitmodules 相关 -gitmodule 是第一次遇到,有点抽象的,不过不用管,先酱 +gitmodules 是第一次遇到,有点抽象的,不过不用管,先酱 删除 `gitmodules`