git command

 1  git init

 2  git remote add origin http://[email protected]/scm/mcombleum/menards.com.git

 3  git fetch --depth 1 origin

 4  git fetch --depth 1 pb

 6  git branch

 7  git remote -v

 8  git checkout --track pb/develop

 9  git branch feature/MCR-120306-Detail_Bar

10  git checkout feature/MCR-120306-Detail_Bar

    git status

14  git commit -m'MCR-120306'

$ git push pb  feature/MCR-120306-Detail_Bar:feature/MCR-120306-Detail_Bar

$ git push pb  feature/MCR-120293-Mobile_CirCleSlider:feature/MCR-120293-Mobile_CirCleSlider

$ git push pb  feature/MCR-120309-AnySize_Slider:feature/MCR-120309-AnySize_Slider

$ git push pb  feature/MCR-138295-Expandable_Video:feature/MCR-138295-Expandable_Video

git branch feature/MCR-131016-Expandable_Video

pwd:n!hGhR9

 doublecheck 

 1  git init

 2  git remote add pb http://[email protected]/scm/mcombleum/menards.com.git

 3  git fetch --depth 1 pb

 4  git checkout --track pb/develop

 5  git checkout --track pb/feature/MCR-120306-Detail_Bar

 6  history

 feature/MCR-120293-Mobile_CIrCleSlider

 服务器下代码

 git remote update

 git remote show origin

 git fetch origin

 删除远程分支

 git push pb :feature/MCR-120293-Mobile_CirCleSlider

 git push pb :feature/MCR-120306-Detail_Bar

 git push origin :feature/MCR-120309-AnySize_Slider

 double checkout

 1  git init

 2  git remote add pb http://[email protected]/scm/mcombleum/menards.com.git

 3  git fetch --depth 1 pb

 4  git checkout feature/MCR-120309-AnySize_Slider

 5  history

 git rm --cached xxxxxx path 忽略文件

 git commit -m'remove .classpath .project'

 C:\Users\Kevin.Lv\workspace\gitGui

 10/22

 192.168.4.215

git pull origin MCR-120300-Upload (获取最新MCR-120300-Upload到本地)

git fetch origin

10/27

执行命令避免冲突

git pull pb develop

git pull

  18  git merge origin/develop

  20  git merge pb/develop (merge)

  22  git status

  23  git stash

  24  git status

  25  git merge pb/develop

  26  git status

  27  git merge pb/develop

  

  

  //最新develope的代码

  git fetch pb (fetch)

  

  10/30

  

feature/MCR-131016-Lightbox_Template

 portal.menard-inc.com/bleumMCOM

11/10/2014

 修改bug

 git clone (develop)

 (先把需要的MCR代码merge到develop下,新建一个GIT.MERGEMCR,下最新的代码)

 git clone http://[email protected]/scm/mcombleum/menards.com.git "D:\MCOM.GIT_Clone" 

 git branch bugfix/MCR-120306-Detail_Bar

 git checkout bugfix/MCR-120306-Detail_Bar

 git add 'Menards.com/src/content/content/js5/scrolldetailbar.js'

 git commit -m'MCR-120306'

 git push pb  bugfix/MCR-120306-Detail_Bar:bugfix/MCR-120306-Detail_Bar

 git merge bugfix/MCR-120306-Detail_Bar (develop下)

 git push origin develop (develop下)

 11/11/2014

 修改bug

 git merge bugfix/MCR-120306-Detail_Bar (develop下)

 git push origin develop (develop下)

 //取消暂存 benchmarks.rb 文件

 git reset HEAD benchmarks.rb

 //取消对文件的修改

 git checkout --file<-->

 git checkout -- benchmarks.rb

相关推荐