Git简介¶

# 更新已经追踪的文件，未追踪要add
# git add .
git commit -a
git push

# 前跳一次 reset默认的mixed就很好用
git reset HEAD^

# reset错了返回未来 用reflog查HEAD的移动记录
git reflog
git reset <commit>

# 仅恢复某个文件/目录
git checkout <commit> <path>

# 移动HEAD
git checkout test
git checkout <commit>

# 不移动HEAD
git checkout . # 从暂存区覆盖工作区
git checkout HEAD~2 <path> # 拿两个版本前的文件覆盖

# 1.merge多个commit
# 注：pull底层就是把origin/x合并到x
git checkout main
git merge test new
# 解决冲突
git commit -a

# 2.rebase 把从lca开始的修改叠加到某一个commit上
git rebase test
# 解决冲突
git add .
git rebase --continue

# author email
git config --global user.name "hyj0824"
git config --global user.email "2417179808@qq.com"

# commit图
git log --oneline --graph

# rm + git add：删除文件并stage
git rm *

# 取消文件追踪不删除文件 make it untracked
git rm --cached *
git restore --staged *

# reset HEAD^1后再做一次commit，也就是修改最新commit
git commit --amend -m "xxx"
git commit --amend --no-edit # 不修改message
git commit --allow-empty -m "a" # 空commit

# 记录变动并合并到最新commit
git commit -a --amend --no-edit

# 删除远端分支
git push origin :new

# cherry-pick 仅拉取特定的commit内容，而不是从lca开始的全部commit
git cherry-pick "sha1" "sha2"

# 立刻 gc
git fsck --unreachable
git reflog expire --all --expire=now
git gc --prune=now

# 路径显示中文
git config --global core.quotepath false

git config --global http.proxy socks5://127.0.0.1:20170
git config --global https.proxy socks5://127.0.0.1:1080

git config --global http.proxy http://127.0.0.1:20171
git config --global https.proxy https://127.0.0.1:8080

git config --global --unset http.proxy
git config --global --unset https.proxy

git config -l --global

PS C:\Users\24171\Documents\GitHub\Playground> git checkout 41cb26f
Note: switching to '41cb26f'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

PS C:\Users\24171\Documents\GitHub\Playground> git commit -a
[detached HEAD c599bef]         modified:   note.md
 1 file changed, 3 insertions(+), 6 deletions(-)
PS C:\Users\24171\Documents\GitHub\Playground> git checkout master
Warning: you are leaving 2 commits behind, not connected to
any of your branches:

  c599bef       modified:   note.md
  9a7602e       new file:   note.md

If you want to keep them by creating a new branch, this may be a good time
to do so with:

 git branch <new-branch-name> c599bef

Switched to branch 'master'

*.txt , *.xls  # 表示过滤某种类型的文件
target/  # 表示过滤这个文件夹下的所有文件
/test/a.txt , /test/b.xls  # 表示指定过滤某个文件下具体文件
!*.java , !/dir/test/     # !开头表示不过滤
*.[ab]    # 支持通配符：过滤所有以.a或者.b为扩展名的文件
/test  # 仅仅忽略项目根目录下的 test 文件，不包括 child/test等非根目录的test目录