git常用命令

February 27, 2023

文档：https://git-scm.com/docs
pro-git：https://git-scm.com/book/zh/v2/
参考：https://github.com/xjh22222228/git-manual/blob/main/README.md

提交

git commit [-m <message>]
git commit -a
git commit --amend

git status
git log [--oneline]
git diff

分支

git branch <branch>
git checkout <branch>
git checkout -b <branch>

git switch <branch>
git switch -c <branch>

git branch -d <branch>
git push <remote> --delete <branch>

重命名分支

git branch -m <branch>            # 重命名当前
git branch -m <branch> <new-name> # 重命名指定
git push origin :<branch>         # 删除旧分支
git push -u origin <new-name>     # 推送新分支

远程

git fetch --all
git branch -a
git branch -vv # 查看本地分支所关联的远程分支

git remote add <remote> <url>
git remote # 查看远程仓库
git remote -v # 查看当前远程仓库地址

git remote show <remote> # 查看指定远程仓库信息
git remote rename <remote> <new-name>
git remote remove <remote>
git remote set-url origin <url>

git fetch <remote>
git fetch <remote>/<branch>

git push <remote> [<branch>]
git push <remote> <branch>:<remote-branch>
git push <remote> --delete <branch>

git checkout -b <branch> <remote>/<branch>
git checkout --track <remote>/<branch>
git checkout <branch> # 从远程分支创建同名本地分支

git branch -u <remote>/<branch> # 将当前分支关联至远程分支
git push -u <remote> <branch> # 关联并推送

合并

git checkout master
git merge fix

git checkout fix
git rebase master

撤销

git reset --soft <commit-hash>  # 仅回退提交历史，保留修改
git reset --hard <commit-hash>  # 完全回退提交、暂存区和工作区的更改
git revert <commit-id>          # 生成一个新提交，来撤销指定的提

github create a new repository

echo "# test" >> README.md
git init
git add README.md
git commit -m "first commit"
git branch -M main # 将默认的master分支强制改为main
git remote add origin https://github.com/user/repo.git # 添加远程仓库origin
git push -u origin main # 将main分支关联并推送至远程origin

←Back to home

This work is licensed under CC BY-NC-SA 4.0