廖雪峰Git教程中Git 命令总结(一)_[master (root-commit) 48f7cba] wrote a readme file-CSDN博客

一. Git安装和配置(Windows)

1.用户名和Email地址

$ git config --global user.name "Your Name"
$ git config --global user.email "email@example.com"

2.创建版本库

1).创建一个空目录
pwd 命令用于显示当前目录
2).通过git init命令把目录变成Git可以管理的仓库

$ mkdir learngit
$ cd learngit
$ pwd
/Users/michael/learngit

$ git init
Initialized empty Git repository in /Users/michael/learngit/.git/

3.添加文件

编写一个readme.txt文件,将其放在仓库目录中,内容如下

Git is a version control system.
Git is free software.

1) 用命令git add把文件添加到仓库：

$ git add readme.txt

2)用命令git commit把文件提交到仓库

$ git commit -m "wrote a readme file"
[master (root-commit) eaadf4e] wrote a readme file
 1 file changed, 2 insertions(+)
 create mode 100644 readme.txt

-m后面输入的是本次提交的说明，可以输入任意内容，当然最好是有意义的，这样就能从历史记录里方便地找到改动记录。
commit可以一次提交很多文件，所以你可以多次add不同的文件，比如：

$ git add file1.txt
$ git add file2.txt file3.txt
$ git commit -m "add 3 files."

二. 本地仓库管理

继续修改readme.txt文件:

Git is a distributed version control system.
Git is free software

运行git status命令看看结果：

$ git status
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

no changes added to commit (use "git add" and/or "git commit -a")

git status命令可以让我们时刻掌握仓库当前的状态.
git diff命令可以查看difference，显示的格式正是Unix通用的diff格式

$ git diff readme.txt 
diff --git a/readme.txt b/readme.txt
index 46d49bf..9247db6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,2 +1,2 @@
-Git is a version control system.
+Git is a distributed version control system.
 Git is free software

将修改后的readme.txt文件提交到仓库

$ git add readme.txt
$ git commit -m "add distributed"
[master e475afc] add distributed
 1 file changed, 1 insertion(+), 1 deletion(-)

提交后，再用git status命令看看仓库的当前状态：

$ git status
On branch master
nothing to commit, working tree clean

Git告诉我们当前没有需要提交的修改，而且，工作目录是干净（working tree clean）的。

修改readme.txt文件如下：

Git is a distributed version control system.
Git is free software distributed under the GPL.

提交：

$ git add readme.txt
$ git commit -m "append GPL"
[master 1094adb] append GPL
 1 file changed, 1 insertion(+), 1 deletion(-)

1. 版本回退

回顾一下readme.txt文件的几个版本:

wrote a readme file

Git is a version control system.
Git is free software.

add distributed

Git is a distributed version control system.
Git is free software.

append GPL

Git is a distributed version control system.
Git is free software distributed under the GPL.

使用 git log命令可以显示从最近到最远的提交日志:

$ git log

加–pretty=oneline参数的git log命令:

$ git log --pretty=oneline
1094adb7b9b3807259d8cb349e7df1d4d6477073 (HEAD -> master) append GPL
e475afc93c209a690c39c13a46716e8fa000c366 add distributed
eaadf4e385e865d25c48e7ca9c8395c3f7dfaef0 wrote a readme file

Git必须知道当前版本是哪个版本，在Git中，用HEAD表示当前版本，也就是最新的提交1094adb…上一个版本就是HEAD^，上上一个版本就是HEAD^^，当然往上100个版本写成HEAD~100。

git reset命令将当前版本回退到指定的版本

$ git reset --hard HEAD^
HEAD is now at e475afc add distributed

根据commit id回溯或前溯到某个版本:

$ git reset --hard 1094a
HEAD is now at 83b0afe append GPL

cat命令可以查看文件内容

$ cat readme.txt
Git is a distributed version control system.
Git is free software.

git reflog命令查看Git记录的每一次命令,从而得到commit id

$ git reflog
e475afc HEAD@{1}: reset: moving to HEAD^
1094adb (HEAD -> master) HEAD@{2}: commit: append GPL
e475afc HEAD@{3}: commit: add distributed
eaadf4e HEAD@{4}: commit (initial): wrote a readme file

2. 工作区和暂存区

工作区（Working Directory）例如learngit文件夹
版本库（Repository）工作区的隐藏目录.git
- 暂存区 (stage or index)
- master分支
- HEAD指针
  
  git add命令实际上就是把要提交的所有修改放到暂存区（Stage；
  git commit命令实际上就是把暂存区的所有修改提交到当前分支(master)。
  一旦提交后，如果你又没有对工作区做任何修改，那么工作区就是“干净”的.

3. 管理修改

Git跟踪并管理的是修改，而非文件.下面是举例证明:

对readme.txt做一个修改:

$ cat readme.txt
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes.

添加到暂存区:

$ git add readme.txt

再修改readme.txt:

$ cat readme.txt 
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.

提交

$ git commit -m "git tracks changes"
[master 519219b] git tracks changes
 1 file changed, 1 insertion(+)

提交后，再看看状态：

$ git status
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

no changes added to commit (use "git add" and/or "git commit -a")

用git diff HEAD – readme.txt命令可以查看工作区和版本库里面最新版本的区别：

$ git diff HEAD -- readme.txt 
diff --git a/readme.txt b/readme.txt
index 76d770f..a9c5755 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
 Git is a distributed version control system.
 Git is free software distributed under the GPL.
 Git has a mutable index called stage.
-Git tracks changes.
+Git tracks changes of files.

每次修改，如果不用git add到暂存区，那就不会加入到commit中。

4. 撤销修改

git checkout – file可以丢弃工作区的修改,让文件回到最近一次git commit或git add时的状态
- readme.txt自修改后还没有被放到暂存区，现在，撤销修改就回到和版本库一模一样的状态
- readme.txt已经添加到暂存区后，又作了修改，现在，撤销修改就回到添加到暂存区后的状态
git reset HEAD <’file>可以把暂存区的修改撤销掉（unstage），重新放回工作区
- 修改只是添加到了暂存区，还没有提交时使用该命令
- 使用该命令后,暂存区时干净的,工作区有修改,还需要使用git checkout – file命令丢弃工作区修改
- ..
已经提交了不合适的修改到版本库时，想要撤销本次提交，参考版本回退一节，不过前提是没有推送到远程库

5. 删除文件

在Git中，删除也是一个修改操作
rm命令在文件管理器(工作区)删除文件

$ rm test.txt

从版本库中删除文件要使用git rm命令,并且 git commit

$ git rm test.txt
rm 'test.txt'

$ git commit -m "remove test.txt"
[master d46f35e] remove test.txt
 1 file changed, 1 deletion(-)
 delete mode 100644 test.txt

git checkout用版本库里的版本替换工作区的版本，无论工作区是修改还是删除，都可以“一键还原”。

$ git checkout -- test.txt

工作区和版本库就不一致时，git status命令会提示哪些文件被删除了：

$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    test.txt

no changes added to commit (use "git add" and/or "git commit -a")