-
将代码先从git上克隆到本地;
-
查看本地分支
$ git branch
- br-2.1.2.2
master
test
3.切换分支到test
shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)
$ git branch
- br-2.1.2.2
master
test
shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)
$ git checkout test
M jingwei-server/src/main/java/com/taobao/jingwei/server/service/cmd/GetCustomerTarCmd.java
M jingwei-server/src/main/java/com/taobao/jingwei/server/util/ServerUtil.java
Switched to branch 'test'
shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (test)
$ git branch
br-2.1.2.2
master
- test
4. 查看提交记录
$ git log commit 3628164fb26d48395383f8f31179f24e0882e1e0 Author: Michael Liao askxuefeng@gmail.com Date: Tue Aug 20 15:11:49 2013 +0800
append GPL
commit ea34578d5496d7dd233c827ed32a8cd576c5ee85 Author: Michael Liao askxuefeng@gmail.com Date: Tue Aug 20 14:53:12 2013 +0800
add distributed
commit cb926e7ea50ad11b8f9e909c05226233bf755030 Author: Michael Liao askxuefeng@gmail.com Date: Mon Aug 19 17:51:55 2013 +0800
wrote a readme file
以下是比较简洁的用法:
$ git log --pretty=oneline 3628164fb26d48395383f8f31179f24e0882e1e0 append GPL ea34578d5496d7dd233c827ed32a8cd576c5ee85 add distributed cb926e7ea50ad11b8f9e909c05226233bf755030 wrote a readme file
5. 将当前版本恢复到某一历史版本
$ git reset --hard HEAD^ HEAD is now at ea34578 add distributed
<注:Git必须知道当前版本是哪个版本,在Git中,用HEAD表示当前版本,也就是最新的提交3628164...882e1e0(注意我的提交ID和你的肯定不一样),上一个版本就是HEAD,上上一个版本就是HEAD,当然往上100个版本写100个比较 容易数不过来,所以写成HEAD~100>
6. 再将代码推到远程上,即可
$ git push --force
至此回退结束
参考文档:版本回退 - 廖雪峰的官方网站
其它git相关:
① git 的工作区和暂存区