git checkout master git pull
git branch master_hotfix
git checkout master_hotfix
coding
git checkout dev git merge master_hotfix
git push origin dev
git checkout master git merge master_hotfix
git push origin master
git tag -a 1.1.0 -m "紧急修复xxbug"
git push --tag
git branch -d master_hotfix
git checkout dev
vim ~/.gitconfig
[alias] br = branch ci = commit cl = clone co = checkout cp = cherry-pick cfg = clone df = diff fh = fetch lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative" mg = merge pl = pull plr = pull --rebase rb = rebase ph = push rmt = remote rst = reset sh = stash st = status sts = status -s sbm = submodule sw = show swf = "show --name-status" delb = "push origin --delete" delt = "push origin :" mb = merge-base
比如:
git commit -m'注释'
可以简化为:
git ci -m'注释'
团队协作是职业生涯中必须面对的问题,Git为我们代码的协作管理提供了强大的工具。 熟悉Git操作,拥抱团队协作。