1
# Linux 安装
2
sudo apt install -y vim git
3

4
# 全局配置用户信息
5
git config --global user.name "aLinChe"
6
git config --global user.email "1129332011@qq.com"
7
git config --global core.editor vim
8
git config --global color.ui true

1
git init [project_name]
2
/// or
3
git clone https://github.com/DragonOS-Community/DragonOS
4

5
git status
6
git add .
7
git commit -m "feat(add-func): feat template-function-add to ..."
8

9
git fetch
10
git pull --all
11
git pull --rebase
12

13
git push
14
git push -f

1
# 创建新分支并切换到该分支
2
git checkout -b [branch-name]
3
# 切换到对应分支
4
git checkout [branch-name]
5

6
git branch -vv
7
git branch -a
8

9
# 删除本地分支
10
git branch -d [branch-name] # 安全删除(已合并)
11
git branch -D [branch-name] # 强制删除(未合并)

1
git checkout master
2
git merge feat/add_branch    # 合并指定分支(feat/add_branch)到当前分支(master)
3
git push                     # 推送合并结果
4
git checkout feat/add_branch # 切换回原开发分支
5
/// or
6
git checkout feat/add_branch
7
git rebase master                    # 将当前分支变基到master
8
git branch -f master feat/add_branch # 移动master指针 or
9
git checkout master                  # 切换到master
10
git push                             # 推送更新
11
git checkout feat/add_branch         # 切换回原开发分支

1
# 撤销与重置
2
git reset HEAD~n         # 撤销最近 n 次提交
3
git reset --hard HEAD~n  # 丢弃最近 n 次提交
4
git reset [hashed]
5
git reset --keep [hashed]
6

7
git revert [hashed]      # 创建新提交来撤销更改
8

9
git push origin [branch-name]
10
git branch -d [branch-name]
11
git branch -D [branch-name]
12
git push origin -d [branch-name]
13

14
git rebase -i HEAD~n
15
squash
16
# pick   - 保留提交
17
# reword - 修改提交信息
18
# edit   - 修改提交内容
19
# squash - 合并到前一个提交
20
# drop   - 丢弃提交

1
# 临时储藏更改
2
git stash
3
git stash save "描述信息"
4
git stash list
5
git stash pop
6
git stash apply stash@{n}
7
git stash drop stash@{n}

1
# 选择性应用提交
2
git cherry-pick [commit-hash]
3

4
git cherry-pick [start-hash]^..[end-hash]
5

6
git cherry-pick [hash1] [hash2] [hash3]

1
git remote -v
2
git remote add [shortname] [url]
3
git remote set-url --push upstream no_push # 删掉 upstream_url 防止意外 push -f
4
git branch -u [remote]/[branch] [当前分支]
5
git branch --set-upstream-to=upstream/master origin/master
6
git branch -vv -a
7

8
git remote show origin
9
git push -u origin feat/add # 首次推送并建立关联 ## 等效于 git branch -u origin/feat/add
10
git branch --unset-upstream # 取消错误的追踪
11

12
# 删除远程分支
13
git push origin -d [branch-name]
14

15
git fetch upstream
16
git checkout master
17
git rebase upstream/master
18

19
git archive

1
git submodule add https://github.com/user/submodule.git # 添加子模块
2

3
git clone --recurse-submodules https://github.com/user/repo.git # 克隆包含子模块的仓库
4

5
git submodule update --init --recursive # 更新子模块