要養成一個習慣:
*在master下git pull
*而後在工做branch下git merge masterlinux
git branch -agit
沒有得到全部tag這一說
git tag 便可得到所有tag listwindows
打tag步驟
git checkout master
git pull
git merge branch-name瀏覽器
git tag -a -m 'xxx' tag-xxx (這裏的a表示標籤類型annotated)緩存
git push origin master --follow-tags
-- it won't push annotated tags on unrelated branches安全
刪除本地tag
git tag -d tagName
刪除遠程tag
git push origin :refs/tags/tag-Name
git push origin --delete tag <tagname>bash
獲取遠程tag
git fetch origin tag <tagname>ssh
上傳推送標籤 push tag
單獨推送某條標籤比較安全
git push origin <tag_name>svn
drush cc all測試
drush updb -y
git的操做步驟
git checkout master -- 回到中心地帶
git fetch origin master:tmp
git diff tmp
git merge tmp
部署環境:
把這個branch merge master,
打一個tag
prod deploy 這個tag
看是否一切正常
master merge這個tag就行了
無論是merge一個tag仍是一個branch
都須要update被merge的對象
git fetch --tags origin
git pull origin tag_name
git merge tag_name
git merge branch-name
如何測試網頁有沒有問題
1 清除瀏覽器的緩存
2 登陸頁面四處點擊
drush eval "drupal_set_message(t('ok good nice'));"
drush eval "variable_set('xxx',FALSE);"
//可行
drush vget xxx
drush fr alu_features_xxx -y
drush cc all
刪除分支
git branch -D <branchName>
git push origin --delete <branchName>
git branch -D <branchName1> <branchName2>
新建分支
git checkout master
git pull
git checkout -b <branchName>
---- git checkout -B <branchName> origin/<branchName>
git checkout -B <branchName> origin/master
generate a pair of rsa public/private key
use ssh-keygen in linux or use putty-gen.exe in windows
在git bash裏面能夠使用ssh-keygen命令的
3. put your private key on C:\Users\[your xxx]\.ssh\id_rsa on windows4. send your public key id_rsa.pub xxx5. After step4 done, try git clone "git clone xxx@svn-xxx.xxx.hosting.acquia.xxx.git"