# 拉取代码
git pull --all
# 提交dev分支到远程仓库
git push origin dev
# 将某一个提交的变更应用到代码库
git cherry-pick -n bd61ad98
# 将某区间提交的变更应用到代码库
git cherry-pick -n bd61ad98^..ade56rq1
# 强制回退到上一个commit(未push)
git reset --hard HEAD^
# 强制回退到上上个commit(未push)
git reset --hard HEAD~2
# 回退到上一个commit, 但保留变更后的文件
git reset HEAD^
# 取消某个版本的修改
git revert <commit hash>

# 生成ssh key
ssh-keygen -t ed25519 -C "[email protected]"
# 把ssh公钥(pub后缀的文件)加入到git账户
# 把ssh key加入到ssh-agent
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_ed25519
# 测试
ssh -T [email protected]

# 杀掉所有ssh-agent进程
# 因为每开一个terminal就要跑这些命令，开始一个ssh-agent，运行一段时间之后，后台就会有很多进程
# bash
ps -ef | grep ssh-agent | grep -v grep | awk '{print $2}' | xargs kill -9
# windows
taskkill /F /IM ssh-agent.exe /T

git mv 2017032003.md csharp

git show --pretty="" --name-only bd61ad98

git log --follow -- filename

git worktree add -b hotfix ../hotfix
git worktree list
pushd ../hotfix
# working on hotfix branch
popd
git worktree remove ../hotfix
git worktree prune

git stash show -p

git stash -- filename.ext

### 先找到被删除时的commit
git log -- <filename>
git checkout <deletion commit hash>~1 -- <filename>

git rm --cached remove_file
# add file to gitignore`
git add .gitignore`
git commit -m "Excluding"`

git branch -m <old_name> <new_name>
git push <remote> --delete <old_name>
# OR shorter
# git push <remote> :<old_name>
git branch --unset-upstream <new_name>
git push <remote> <new_name>
git push <remote> -u <new_name>

git clone https://[email protected]/username/repository.git

# 使用token进行clone(其实跟上面没有本质区别，token本来就是用来代替密码的)
git clone https://username:[email protected]/username/repository.git

git diff --no-prefix > ~/some-feature.diff

# 把多个commit合并成一个
git rebase -i <待合并commit的前一个commit>
# 如果已经push到了remote，rebase完成后需要强制push
git push -f