git的使用记录

1.git的原理

2.git的常用命令

1.git提交历史

git log --oneline
a6251d717 (origin/onlineorder3, origin/hs_onlineorder3_interview, onlineorder3) 生成驻行测调整
e584fda7d 收银台信息增加进行中的支付单号
a9aa26960 生成合同签约主体存储错误
9405aecca 自动请款确认
bd75f9701 去除申请中的条件判断
13a866460 Merge remote-tracking branch 'origin/onlineorder3' into onlineorder3

2.暂存区和工作区都会进行回退

git reset --hard <commit>

3.git reflog

afa85cf59 (HEAD -> hs_onlineorder3_interview) HEAD@{0}: commit: 面签通过添加请款确认
a6251d717 (origin/onlineorder3, origin/hs_onlineorder3_interview, onlineorder3) HEAD@{1}: reset: moving to a6251d717
5b96e4030 HEAD@{2}: commit: 面签通过添加请款确认
a6251d717 (origin/onlineorder3, origin/hs_onlineorder3_interview, onlineorder3) HEAD@{3}: checkout: moving from onlineorder3 to hs_onlineorder3_interview
a6251d717 (origin/onlineorder3, origin/hs_onlineorder3_interview, onlineorder3) HEAD@{4}: checkout: moving from hs_onlineorder3_interview to onlineorder3
a6251d717 (origin/onlineorder3, origin/hs_onlineorder3_interview, onlineorder3) HEAD@{5}: checkout: moving from hs_online_jieyue to hs_onlineorder3_interview
ae2febb2e (origin/hs_online_jieyue, hs_online_jieyue) HEAD@{6}: commit: 添加进件DTO

4.git merge

当没有文件需要合并，但是Git状态是|MERGING时，使用命令:

git merge --abort

3.git的使用注意事项