git init 创建仓库
git add XX 将代码添加到stage暂存区, 或手动解决代码冲突后标记解决
git commit -m '跟新说明' 提交 ,
git commit -a -m '跟新说明' 把所有已跟踪但未暂存的文件提交
git branch 查看分支
git branch test 创建test分支, git checkout test 切换test分支, git checkout -b test 前两句命令简写创建并且切换到test分支
git branch -d test 删除分支
git merge test (合并分支主要步骤是1:先切换回主线分支2:然后再执行这条命令,将分支代码合并到主线分支上)
git status -s 文件详情 git diff 未暂存作了哪些修改 git diff --stage 暂存区作了哪些修改
| Alias | Command |
|---|---|
| g | git |
| ga | git add xxx 后面可以指明要跟踪的文件或目录路径 |
| gaa | git add --all |
| gapa | git add --patch |
| gb | git branch |
| gba | git branch -a |
| gbd | git branch -d |
| gbl | git blame -b -w |
| gbnm | git branch --no-merged |
| gbr | git branch --remote |
| gbs | git bisect |
| gbsb | git bisect bad |
| gbsg | git bisect good |
| gbsr | git bisect reset |
| gbss | git bisect start |
| gc | git commit -v |
| gc! | git commit -v --amend |
| gca | git commit -v -a |
| gca! | git commit -v -a --amend |
| gcan! | git commit -v -a --no-edit --amend |
| gcans! | git commit -v -a -s --no-edit --amend |
| gcam | git commit -a -m |
| gcsm | git commit -s -m |
| gcb | git checkout -b |
| gcf | git config --list |
| gcl | git clone --recursive |
| gclean | git clean -fd |
| gpristine | git reset --hard && git clean -dfx |
| gcm | git checkout master |
| gcd | git checkout develop |
| gcmsg | git commit -m |
| gco | git checkout |
| gcount | git shortlog -sn |
| gcp | git cherry-pick |
| gcpa | git cherry-pick --abort |
| gcpc | git cherry-pick --continue |
| gcs | git commit -S |
| gd | git diff |
| gdca | git diff --cached |
| gdct | git describe --tags `git rev-list --tags --max-count=1` |
| gdt | git diff-tree --no-commit-id --name-only -r |
| gdw | git diff --word-diff |
| gf | git fetch |
| gfa | git fetch --all --prune |
| gfo | git fetch origin |
| gg | git gui citool |
| gga | git gui citool --amend |
| ggpnp | git pull origin $(current_branch) && git push origin $(current_branch) |
| ggpull | git pull origin $(current_branch) |
| ggl | git pull origin $(current_branch) |
| ggpur | git pull --rebase origin $(current_branch) |
| glum | git pull upstream master |
| ggpush | git push origin $(current_branch) |
| ggp | git push origin $(current_branch) |
| ggsup | git branch --set-upstream-to=origin/$(current_branch) |
| gignore | git update-index --assume-unchanged |
| gignored | git ls-files -v | grep "^" |
| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk |
| gk | gitk --all --branches |
| gl | git pull |
| glg | git log --stat --max-count = 10 仅显示简要的增改行数统计 |
| glgg | git log --graph --max-count = 10 |
| glgga | git log --graph --decorate --all |
| glo | git log --oneline --decorate --color |
| glog | git log --oneline --decorate --color --graph |
| glp | _git_log_prettily (git log --pretty=$1) |
| gm | git merge |
| gmt | git mergetool --no-prompt |
| gp | git push |
| gpoat | git push origin --all && git push origin --tags |
| gr | git remote |
| grba | git rebase --abort |
| grbc | git rebase --continue |
| grbs | git rebase --skip |
| grbi | git rebase -i |
| grh | git reset HEAD |
| grhh | git reset HEAD --hard |
| grmv | git remote rename |
| grrm | git remote remove |
| grset | git remote set-url |
| grt | cd $(git rev-parse --show-toplevel || echo ".") |
| grup | git remote update |
| grv | git remote -v |
| gsd | git svn dcommit |
| gsps | git show --pretty = short --show-signature |
| gsr | git svn rebase |
| gss | git status -s |
| gst | git status |
| gsta | git stash save |
| gstaa | git stash apply |
| gstd | git stash drop |
| gstl | git stash list |
| gstp | git stash pop |
| gsts | git stash show --text |
| gts | git tag -s |
| gunignore | git update-index --no-assume-unchanged |
| gunwip | git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1 |
| gup | git pull --rebase |
| gvt | git verify-tag |
| gwch | git whatchanged -p --abbrev-commit --pretty = medium |
| gwip | git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--" |