版本控制（二）git 常用操作

1、git将本地某个分支代码强力覆盖到另外一个分支
git checkout master
git reset --hard develop  //先将本地的master分支重置成develop
git push origin master --force //再推送到远程仓库

➜ sc_wangyueche git:(dev) git checkout design
Switched to branch 'design'
Your branch is behind 'origin/design' by 49 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
➜ sc_wangyueche git:(design) git reset --hard dev
HEAD is now at 4822c37 信息中心前端模板 菜单框架和案例完成

2、将design分支合并到远程dev
➜ sc_wangyueche git:(design) git checkout dev
Switched to branch 'dev'
Your branch is ahead of 'origin/dev' by 7 commits.
(use "git push" to publish your local commits)
➜ sc_wangyueche git:(dev) git merge --no-ff design

Removing src/main/webapp/static/roncoo-adminlte/sichuang/css/ReLTEUser.css
Merge made by the 'recursive' strategy.
src/main/webapp/WEB-INF/view/admin/demo/demo.ftl | 307 +++++++++++++-------------
src/main/webapp/WEB-INF/view/admin/index.ftl | 868 ++++++++++++++++++++++++++++++++----------------------------------------
src/main/webapp/WEB-INF/view/admin/security/list.ftl | 190 +++++++++++-----
src/main/webapp/WEB-INF/view/macro/base.ftl | 8 +-
src/main/webapp/static/roncoo-adminlte/sichuang/css/ReLTEUser.css | 181 ---------------
src/main/webapp/static/roncoo-adminlte/sichuang/css/common/base.css | 19 ++
"src/main/webapp/static/roncoo-adminlte/sichuang/css/main - \345\211\257\346\234\254.css" | 2 +-
src/main/webapp/static/roncoo-adminlte/sichuang/css/main.css | 26 ++-
src/main/webapp/static/roncoo-adminlte/sichuang/images/left/icon1.png | Bin 3324 -> 17715 bytes
src/main/webapp/static/roncoo-adminlte/sichuang/images/left/icon2.png | Bin 3405 -> 17641 bytes
src/main/weapp/static/roncoo-adminlte/sichuang/script/module/demo/demo.js | 75 +++++--
11 files changed, 766 insertions(+), 910 deletions(-)
delete mode 100644 src/main/webapp/static/roncoo-adminlte/sichuang/css/ReLTEUser.css
➜ sc_wangyueche git:(dev) git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 220 bytes | 0 bytes/s, done.
Total 1 (delta 0), reused 0 (delta 0)
remote:

remote: To create a merge request for dev, visit:
remote: https://gitlab.com/gaoshiwei/sc_wangyueche/merge_requests/new?merge_request%5Bsource_branch%5D=dev remote:

To gitlab.com:gaoshiwei/sc_wangyueche.git
bce53da..028c9cc dev -> dev
3、恢复版本

#回退到某个版本 
git reset 057d 
#回退到上一次提交的状态，按照某一次的commit完全反向的进行一次commit 
git revert HEAD
4、将远程dev分支强制覆盖到本地
git fetch --all git reset --hard origin/dev

git pull

1.
创建版本库：mkdir name
cd name
git init
显示当前目录：pwd

git add firename
git commit -m "备注"
git status
git diff firename

2.版本回退：
查看版本： git log --pretty=oneline
回退 git reset --hard HEAD^
命令记录： git reflog

撤销暂存区的文件修改：git reset firename
撤销工作区的文件修改：git checkout -- firename

删除文件：git rm firename
git commit -m "remove firename"

3.远程相关
第一次推送： git push -u origin brname
git push -u origin brname

4.分支管理
创建并切换分支：git checkout -b dev
{ git branch dev
git checkout dev
}
查看分支情况： git branch
切换分支： git checkout dev
合并分支： git merge dev
删除分支： git branch -d dev

5.强制覆盖本地
git fetch --all
git reset --hard origin/dev

http://localhost:8081/sichuang-wangyueche/static/sichuang/main.html