git 开发merge rebase 记录

  519  git status     
  520  git lg
  521  git add src/
  522  git commit -m "restful api and portal"  //先commit到自己的本地branch
  523  git lg
  524  git fetch -p   //origin的commit都会拉到本地
  525  git lg
  526  git rebase origin/develop    //rebase到branch
  527  git status
  528  git lg
  529  git status
  530  git add src/
  531  git commit -m "rebase origin develop" //解决冲突，然后再commit
  532  git lg
  533  git diff 107b458 HEAD
  534  git diff HEAD~1 HEAD
  535  git lg
  536  git branch 
  537  git push origin yhh
  538  git branch
  539  git lg
  540  git branch aaa    //随便建立一个分支
  541  git lg
  542  git checkout yhh   //到自己的开发分支
  543  git reset --hard aaa  //然后强制替换
  544  git lg
  545  git push -f     //push 到 origin的自己开发分支
  546  git lg
  547  git checkout develop  //然后develop merge回来
  548  git merge yhh
  549  git push -f   //更新 origin/develop分支
  550  git lg

 

generate a patch and apply a patch, refer to https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/