20161123常用命令小结

要养成一个习惯：
*在master下git pull
*然后在工作branch下git merge master

 

 

git branch -a

没有获得所有tag这一说
git tag 即可获得全部tag list

打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>

获取远程tag
git fetch origin tag <tagname>

上传推送标签 push tag
单独推送某条标签比较安全
git push origin <tag_name>

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 windows
4. send your public key id_rsa.pub xxx
5. After step4 done, try git clone
"git clone xxx@svn-xxx.xxx.hosting.acquia.xxx.git"