git 用一个分支的内容替换另一个分支,上传一个新分支到远程,重置分支到某一次提交


新建一个dev分支

ray@ray-ubuntu# git checkout -b dev
Switched to a new branch 'dev'

将master分支的内容覆盖掉dev分支上

ray@ray-ubuntu# git reset --hard master 
HEAD is now at 6204280 fix sted timestamp'0' erro

向远程仓库提交新的dev分支

ray@ray-ubuntu# git push origin dev --force
Username for 'https://github.com': xxxxxx
Password for 'https://[email protected]': 
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/rayleeafar/helloworld
 * [new branch]      dev -> dev

向远程仓库添加对dev分支的自动追踪,最后的dev不是分支名是必须加上的一个参数

git branch --set-upstream-to=origin/<branch_name> dev
ray@ray-ubuntu# git branch --set-upstream-to=origin/dev dev
Branch dev set up to track remote branch dev from origin.

查看git提交的记录

ray@ray-ubuntu # git log
commit 1b0d46e9858e6a3c586110cac9cab9cb4de94291
Author: rayleeafar <xxxxxxxxx>
Date:   Mon May 21 12:20:23 2018 +0800

    add test-banch.txt to master

恢复当前版本到某次提交的版本,使用commit记录值的前几位就可以了

ray@ray-ubuntu # git reset --hard 62042
HEAD is now at 6204280 fix sted timestamp'0' erro

查看当前分支:

ray@ray-ubuntu ~/P/helloworld> git branch -l
* dev
  master

猜你喜欢

转载自blog.csdn.net/zeli1511/article/details/80390519