git fetch origin master
git reset --hard FETCH_HEAD
git clean -df
git clone https://github.com/jianyeruan80/work.git
git checkout -p RemLan A.h 更新
git checkout RemLan B.h 新增
rm C.h
submit
git merge RemLan 到当前分
git merge hotfix
git branch -d hotfix //
// 创建lib的远程版本库
# git init --bare lib-rep
// 克隆lib-rep版本库生成lib-clone
# git clone lib-rep lib-clone
// 对lib填充数据,创建、推送提交
# cd lib-clone
# echo 'init' > readme && git add . && git commit -m "init"
# git push -u origin master
// 创建project
# cd ..
# git init project && cd project
# echo 'init' > readme && git add . && git commit -m "init"
用squash参数 git merge dev --squash
1,常用.
A=work B=index C=history D=Remove
git status
git add xxx +暂存
git reset HEAD benchmarks.rb -暂存
git checkout benchmarks.rb -最近暂存修改本地. git checkout .
$ git commit -m 'initial commit'
$ git add forgotten_file
$ git commit --amend
git reflog 本地 q退出
git log --oneline 远程
git pull == get fetch && git merge
git push || git push -f[少用为好把本地版本同步到remove]
git reset --hard b7057a9 把上一次submit息信用submit还原. HEAD~5
git reset b5e1a24f -- b.txt
git rm --cached readme.txt 只从stage中删除,保留物理文件
git rm readme.txt 不但从stage中删除,同时删除物理文件
git mv a.txt b.txt 把a.txt改名为b.txt
2,分支
git branch 查看
git checkout -b XX //-b切换
git merge origin/master back
3,
git remote -v origin https://jianyeruan@bitbucket.org/menusifu/lps-webapp.git (fetch)
hg clone https://jianyeruan@bitbucket.org/jianyeruan/999
本地库:git init
git init
git add README.md
git commit -m "first commit"
git remote add origin https://github.com/jianyeruan80/ioincapp.git / git@github.com:jianyeruan80/ioincapp.git
git push -u origin master
echo # ionicdemo1 >> README.md
git init
git add README.md
git commit -m "first commit"
git remote add origin https://github.com/jianyeruan80/ionicdemo1.git
git push -u origin master
git remote add origin https://github.com/jianyeruan80/ioincapp.git
git push -u origin master
git push -u origin master
git remote add name ssh://git@bitbucket.org/jianyeruan/reponame.git
git remote set-url origin git@github.com:jianyeruan80/rxy01.git
git push -u origin master
git remote rm origin
git remote add origin git@github.com:jianyeruan80/ionicdemo.git
git init
git add . | git add -A
git commit -m "message"
1,mkdir test006
2,cd test006 , git init
3,echo "our first git repository" >> file
4, git add file
5,git commit -m "the first file to commit" file
6, git remote add origin ssh://software@172.16.0.30/~/yafeng/.git
7,git push origin master
git remote show origin
git remote
git remote add origin ssh://software@172.16.0.30/~/yafeng/.g
var cheerio = require('cheerio')
var iconv = require('iconv-lite')
var headers = {
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.65 Safari/537.36'
}
function request (url, callback) {
var options = {
url: url,
encoding: null,
//代理服务器
//proxy: 'http://xxx.xxx.xxx.xxx:8888',
headers: headers
}
originRequest(options, callback)
}
var url = 'http://www.163.com'
request(url, function (err, res, body) {
var html = iconv.decode(body, 'gb2312')
var $ = cheerio.load(html, {decodeEntities: false})
console.log($('h1').text())
console.log($('h1').html())
})
async.series({
one: function (done) {
//处理逻辑
done(null, 'one');
}, function (error, result) {
console.log('one:', result.one);
console.log('two:', result.two);
console.log('three:', result.three);
console.log('four:', result.four);
console.timeEnd('series');
})