git

git 缩写配置

在home目录创建.gitconfig文件复制粘贴以下配置并保存退出

[user]
  name = xx
  email = xx@qq.com
[color]
  interactive = auto
  diff = auto
  status = auto
  branch = auto
  ui = true
  repositoryformatversion = 0
  filemode = true
  bare = false
  logallrefupdates = true
  ignorecase = true
  precomposeunicode = false

[alias]
  co = checkout
  ci = commit
  st = status
  sh = stash
  sa = stash apply
  sp = stash pop
  ap = add -p
  br = branch
  cp = checkout -p
  cv = commit -v
  dc = diff --cached
  d = diff
  pr = pull --rebase
  ps = push
  l = log --graph --pretty=format:'%C(yellow)%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=short --all
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
[hub]
  protocol = https
[diff]
  tool = vimdiff
[core]
  editor = vim

常用缩写

git co
git br
git ci
git lg

工作流

开发新功能a

proj1 a 基于proj1分支创建一个a分支(step1) a分支开发完后合并入proj1分支,并删除a分支(step2) proj1 a

step1:
git br a proj1
git push origin a

step2:
git co proj1
git pull
git co a
git merge proj1
git push

git co proj1
git merge a
git push
git br -D a

常用命令

删除远程分支a:
- 切换到本地其它分支,如master

git co master

删除远程分支

git push origin --delete a

修改远程分支地址

git remote -v
git remote rm origin
git remote add origin git@gitee.com:cfanzp/linux_note.git

git tag

命令	作用
git tag	查看标签列表
git tag -l “v1.0*”	模糊匹配查询
git tag --list “v0.0*”	模糊匹配查询
git tag -a v1.0 -m “my version 1.0”	添加附注标签
git show v1.0	查看标签相关信息
git tag -lw	创建轻量标签，git show 不会看到额外标签信息
git tag -a v0.9 9fceb02	后期打标签
git push origin --tags	将标签推送到远端
git tag -d v1.0	删除标签
git push origin --delete	删除远端标签

git diff

命令	作用
git diff	查看差异
git diff cached	查看工作版本和暂存的差异
git diff HEAD	查看工作版本和HEAD的差异
git diff HEAD^ HEAD	查看上上个版本和HEAD的差异
git diff --stat	查看差异的文件列表
git diff --stat ./client	查看client目录差异的文件列表
git diff > patch	使用git diff 打补丁
git apply --check patch	使用补丁,没有任何输出表示可以顺利接受这个补丁
git apply --reject patch	使用补丁,冲突会生成.rej文件