git学习笔记

最新推荐文章于 2024-12-15 11:58:37 发布

lf14

最新推荐文章于 2024-12-15 11:58:37 发布

阅读量379

点赞数

CC 4.0 BY-SA版权

分类专栏： Used Tool

本文链接：https://blog.youkuaiyun.com/helloeveryon/article/details/50176055

Used Tool 专栏收录该内容

11 篇文章

订阅专栏


git config --global user.name "luofeng" 
git config --global user.email "490613428@qq.com"
 git init
git diff readme.txt //比较工作区和版本库
git status //比较暂存区和版本库,工作区和版本库situation1:
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   readme.txt
#
situation2:
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   readme.txt
#
git add readme.txt
 git commit -m "append GPL
git reset --hard ff0985
cat readme.txt
$ git log --pretty=oneline
3628164fb26d48395383f8f31179f24e0882e1e0 append GPL
ea34578d5496d7dd233c827ed32a8cd576c5ee85 add distributed
cb926e7ea50ad11b8f9e909c05226233bf755030 wrote a readme file
$ git reflog
ea34578 HEAD@{0}: reset: moving to HEAD^
3628164 HEAD@{1}: commit: append GPL
ea34578 HEAD@{2}: commit: add distributed
cb926e7 HEAD@{3}: commit (initial): wrote a readme file
现在总结一下：
HEAD指向的版本就是当前版本，因此，Git允许我们在版本的历史之间穿梭，使用命令git reset --hard commit_id。
穿梭前，用git log可以查看提交历史，以便确定要回退到哪个版本。
要重返未来，用git reflog查看命令历史，以便确定要回到未来的哪个版本。
git checkout -- readme.txt
$ git reset HEAD readme.txt
Unstaged changes after reset:
M       readme.txt

from:http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/0013744142037508cf42e51debf49668810645e02887691000