Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull-Request [ShanghaiTech-10-1-2024] from Obsidian #98

Merged
merged 31 commits into from
Oct 1, 2024
Merged

Pull-Request [ShanghaiTech-10-1-2024] from Obsidian #98

Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a5328ea
PUSH NOTE : Git Guide.md
HeZeBang Oct 1, 2024
62fadee
PUSH ATTACHMENT : v2-aef704a4c112eaaf5e8637587ee17df3_1440w.webp
HeZeBang Oct 1, 2024
db266c0
PUSH ATTACHMENT : 1352126739_7909.jpg
HeZeBang Oct 1, 2024
1b2385e
PUSH ATTACHMENT : Pasted image 20231223135506.png
HeZeBang Oct 1, 2024
2ad67ad
PUSH ATTACHMENT : Pasted image 20231217132520.png
HeZeBang Oct 1, 2024
53c9e23
PUSH ATTACHMENT : Pasted image 20231217132117.png
HeZeBang Oct 1, 2024
2763d0c
PUSH ATTACHMENT : Pasted image 20231222112910.png
HeZeBang Oct 1, 2024
2cdffeb
PUSH ATTACHMENT : Pasted image 20231222112946.png
HeZeBang Oct 1, 2024
77cdde2
PUSH ATTACHMENT : Pasted image 20231222113145.png
HeZeBang Oct 1, 2024
5a0b72f
PUSH ATTACHMENT : Pasted image 20231222115629.png
HeZeBang Oct 1, 2024
29343fc
PUSH ATTACHMENT : Pasted image 20231222145659.png
HeZeBang Oct 1, 2024
c00656c
PUSH ATTACHMENT : Pasted image 20231222150218.png
HeZeBang Oct 1, 2024
4cd24b8
PUSH ATTACHMENT : Pasted image 20231222145930.png
HeZeBang Oct 1, 2024
61d2b0b
PUSH ATTACHMENT : Pasted image 20231222150018.png
HeZeBang Oct 1, 2024
842b863
PUSH ATTACHMENT : Pasted image 20231222150357.png
HeZeBang Oct 1, 2024
f57a0fe
PUSH ATTACHMENT : Pasted image 20231223135038.png
HeZeBang Oct 1, 2024
2da71c4
PUSH ATTACHMENT : Pasted230v9u4j.png
HeZeBang Oct 1, 2024
af90ca1
PUSH ATTACHMENT : Pasted13crvt93pjpi4.png
HeZeBang Oct 1, 2024
990268a
PUSH ATTACHMENT : Pasted12erewfdso.png
HeZeBang Oct 1, 2024
0afcfd1
PUSH ATTACHMENT : Pasted12erqfwijc12.png
HeZeBang Oct 1, 2024
b4b6ca4
PUSH ATTACHMENT : Pasted12eelfkd.png
HeZeBang Oct 1, 2024
4d2c83b
PUSH ATTACHMENT : Pasted12eeipwcj23r.png
HeZeBang Oct 1, 2024
5c8d27d
PUSH ATTACHMENT : Pasted1cejck3rvn.png
HeZeBang Oct 1, 2024
7da0b10
PUSH ATTACHMENT : Pasted23r9icjconl.png
HeZeBang Oct 1, 2024
344eef5
PUSH ATTACHMENT : Pasted13v-0i65j5v45.png
HeZeBang Oct 1, 2024
78f387a
PUSH ATTACHMENT : Pasted000001.png
HeZeBang Oct 1, 2024
9aef5d8
PUSH ATTACHMENT : Pasted12cerv3by6uu.png
HeZeBang Oct 1, 2024
4debc26
PUSH ATTACHMENT : Pasted image 20231223215320.png
HeZeBang Oct 1, 2024
30ba907
PUSH ATTACHMENT : Pasted image 20231223214659.png
HeZeBang Oct 1, 2024
a7b2218
PUSH ATTACHMENT : Pasted image 20231223215455.png
HeZeBang Oct 1, 2024
e6f6856
PUSH ATTACHMENT : Pasted image 20231223220434.png
HeZeBang Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion docs/ShanghaiTech/SI100B/Git Guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -441,7 +445,7 @@ git config --global user.name "Your Name"

### 解决 Conflict

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

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

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

在使用 Soft reset 的时候，你的电脑上：

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

Expand Down