Skip to content

Commit

Permalink
[PUBLISHER] Merge #98
Browse files Browse the repository at this point in the history
* PUSH NOTE : Git Guide.md

* PUSH ATTACHMENT : v2-aef704a4c112eaaf5e8637587ee17df3_1440w.webp

* PUSH ATTACHMENT : 1352126739_7909.jpg

* PUSH ATTACHMENT : Pasted image 20231223135506.png

* PUSH ATTACHMENT : Pasted image 20231217132520.png

* PUSH ATTACHMENT : Pasted image 20231217132117.png

* PUSH ATTACHMENT : Pasted image 20231222112910.png

* PUSH ATTACHMENT : Pasted image 20231222112946.png

* PUSH ATTACHMENT : Pasted image 20231222113145.png

* PUSH ATTACHMENT : Pasted image 20231222115629.png

* PUSH ATTACHMENT : Pasted image 20231222145659.png

* PUSH ATTACHMENT : Pasted image 20231222150218.png

* PUSH ATTACHMENT : Pasted image 20231222145930.png

* PUSH ATTACHMENT : Pasted image 20231222150018.png

* PUSH ATTACHMENT : Pasted image 20231222150357.png

* PUSH ATTACHMENT : Pasted image 20231223135038.png

* PUSH ATTACHMENT : Pasted230v9u4j.png

* PUSH ATTACHMENT : Pasted13crvt93pjpi4.png

* PUSH ATTACHMENT : Pasted12erewfdso.png

* PUSH ATTACHMENT : Pasted12erqfwijc12.png

* PUSH ATTACHMENT : Pasted12eelfkd.png

* PUSH ATTACHMENT : Pasted12eeipwcj23r.png

* PUSH ATTACHMENT : Pasted1cejck3rvn.png

* PUSH ATTACHMENT : Pasted23r9icjconl.png

* PUSH ATTACHMENT : Pasted13v-0i65j5v45.png

* PUSH ATTACHMENT : Pasted000001.png

* PUSH ATTACHMENT : Pasted12cerv3by6uu.png

* PUSH ATTACHMENT : Pasted image 20231223215320.png

* PUSH ATTACHMENT : Pasted image 20231223214659.png

* PUSH ATTACHMENT : Pasted image 20231223215455.png

* PUSH ATTACHMENT : Pasted image 20231223220434.png
HeZeBang authored Oct 1, 2024
1 parent 4a7502b commit c46f52c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion docs/ShanghaiTech/SI100B/Git Guide.md
Original file line number Diff line number Diff line change
@@ -427,9 +427,13 @@ git config --global user.name "Your Name"
![../res/Pasted1cejck3rvn.png](../res/Pasted1cejck3rvn.png)

对应的按钮的功能分别为

- `Commit` 相当于 `git commit -m [Message]`
- `Commit (Amend)` 对上次的 Commit 进行修改

> 此时 VSCode 会打开你**上一次 Commit** 的内容,假如你上一次出现了少写了一个冒号等等的小错误,而这并不值得新开一个 Commit 时,可以使用 Amend 来追加

- `Commit & Push` 字面意思
- `Commit & Sync` Sync 就是 Push+Pull

@@ -441,7 +445,7 @@ git config --global user.name "Your Name"
### 解决 Conflict

~~在使用 Git 时候最烦人的事情之一~~
~~在使用 Git 时候最烦人的事情之一 ~~

关于贮藏(stash)并不打算在此讲解,可以参考一些资料比如:

@@ -526,6 +530,7 @@ Git History 提供了 Git History 功能,可以方便地查看当前仓库或
##### Soft reset

在使用 Soft reset 的时候,你的电脑上:

- 暂存区(`add` 添加的地方):保留当前的更改
- 工作区(编辑器当前的文件):回到历史版本

0 comments on commit c46f52c

Please sign in to comment.