$ git log --oneline 6a26023 (HEAD -> master) does master follow this new commit? 6cffe14 2018.4.20 change1 5782fe2 third change 0789463 which version checked in? ac01ff3 init hellogit file
现在想将版本重置到父提交
1 2
$ git reset --hard HEAD^ HEAD is now at 6cffe14 2018.4.20 change1
$ tail -5 .git/logs/refs/heads/master ac01ff39a78fa388e1e628754fd55a76feb358d2 0789463b17be77ffe8da6fbc7e4b7777d065008c smxknife <2323937771@qq.com> 1522171550 +0800 commit: which version checked in? 0789463b17be77ffe8da6fbc7e4b7777d065008c 5782fe225003c2bc481d554ddeeab8fecd0dd19d smxknife <2323937771@qq.com> 1522171984 +0800 commit: third change 5782fe225003c2bc481d554ddeeab8fecd0dd19d 6cffe145e4f83255fbdef7f68c4b0ed94acea8bc smxknife <2323937771@qq.com> 1524190757 +0800 commit: 2018.4.20 change1 6cffe145e4f83255fbdef7f68c4b0ed94acea8bc 6a2602307968a2fa13efc3974ab4e0f4e7abf49a smxknife <2323937771@qq.com> 1524318936 +0800 commit: does master follow this new commit? 6a2602307968a2fa13efc3974ab4e0f4e7abf49a 6cffe145e4f83255fbdef7f68c4b0ed94acea8bc smxknife <2323937771@qq.com> 1524323213 +0800 reset: moving to HEAD^
在这里可以找到最后的操作日志,最后一条,reset:moving to HEAD^,提交id由6a26变为6cff
除了直接查看文件外,还可以通过reflog命令来查看
1 2 3 4 5 6
$ git reflog show master | head -5 6cffe14 master@{0}: reset: moving to HEAD^ 6a26023 master@{1}: commit: does master follow this new commit? 6cffe14 master@{2}: commit: 2018.4.20 change1 5782fe2 master@{3}: commit: third change 0789463 master@{4}: commit: which version checked in?
$ git reset --hard master@{1} HEAD is now at 6a26023 does master follow this new commit?
查看日志
1 2 3 4 5 6
$ git log --oneline 6a26023 (HEAD -> master) does master follow this new commit? 6cffe14 2018.4.20 change1 5782fe2 third change 0789463 which version checked in? ac01ff3 init hellogit file
$ git reflog show master | head -5 6a26023 master@{0}: reset: moving to master@{1} 6cffe14 master@{1}: reset: moving to HEAD^ 6a26023 master@{2}: commit: does master follow this new commit? 6cffe14 master@{3}: commit: 2018.4.20 change1 5782fe2 master@{4}: commit: third change