git 常用命令

问题Please commit your changes or stash them before you merge.git reset --hard拉取git pull取消跟踪git update-index --assume-unchanged MysqliDb.php 版本回退git log --pretty=onelinegit reset --hard 139dcfaa558e3276

ItisNagatoYuki

77人浏览 · 2018-05-15 13:03:16

ItisNagatoYuki · 2018-05-15 13:03:16 发布

 
  windows 安装git 
 
  https://git-scm.com/book/zh/v1/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git 
 
  问题Please commit your changes or stash them before you merge. 
 
  git reset --hard 
 
  拉取 
 
  git pull 
 
  取消跟踪 
 
  git update-index --assume-unchanged MysqliDb.php  
 
  版本回退 
 
  git log --pretty=oneline 
 
  git reset --hard 139dcfaa558e3276b30b6b2e5cbbb9c00bbdca96   
 
  版本回退产生的问题解决 
 
  git checkout -b temp 
 
  git checkout master 
 
  git 合并相关 
 
  https://blog.csdn.net/u012031380/article/details/78919374 
 
  历史正确版本 
 
  git reset --hard bb79ab5a0984b00bd7334a842f979b4fcab64cf8 
 
  回退历史版本并提交 
 
  https://blog.csdn.net/newjueqi/article/details/49098123 
 
  http://blog.sina.com.cn/s/blog_5f435c130102xa0p.html