git 版本回退
找到上次Git commit的 id
git reflog
找到你想撤销的commit_id
zhanghuilongdeMacBook-Pro:hrs-std zhanghuilong$ git reflog
96088556 HEAD@{0}: commit (amend): zhanghl2_20170327 机构查询列表 and Kafka配置更换cmt1
57b95b91 HEAD@{1}: commit (amend): zhanghl2_20170327 机构查询列表 and Kafka配置更换
b24de4b3 HEAD@{2}: commit: zhanghl2_20170327 机构查询列表 and Kafka配置更换
e57b8d15 HEAD@{3}: checkout: moving from 20170328_feature_mutilSite to 20170327_feature_organByType
git reset –hard commit_id
完成撤销,同时将代码恢复到前一commit_id 对应的版本。
git reset commit_id
完成Commit命令的撤销,但是不对代码修改进行撤销,可以直接通过git commit 重新提交对本地代码的修改。
git stash 使用
查看暂存历史记录 git stash list
zhanghuilongdeMacBook-Pro:hrs-std zhanghuilong$ git stash list
stash@{0}: On 20170328_feature_mutilSite: 机构查询
stash@{1}: On 20170327_feature_organByType: 朱海机构查询需求
stash@{2}: On 20170327_feature_organByType: kafka
stash@{3}: On medicalCardServer: yibao
stash@{4}: On 20170316_feature_expertGroupAggr: 专家组医生下线不同步问题
zhanghuilongdeMacBook-Pro:hrs-std zhanghuilong$
暂存:git stash save “标记”
git stash save "暂存时的备注,多个分支同时开发时,暂存标注下"
使用暂存历史记录git stash apply
zhanghuilongdeMacBook-Pro:hrs-std zhanghuilong$ git stash apply stash@{3}
不使用 stash@x 时默认恢复最近一次的修改即:stash@{0}