Git 学习笔记–基本操作

• Git 与 SVN 不同，是分布式的版本控制系统，不需要主服务器即可工作，实际中为了方便各个工作者间同步工作，通常还是会设置主服务器。
• Git的设置及初始化：
• 设置全局用户信息：

luojiahu@ubuntu:~/learning/learngit$ git config --global user.name "luojiahu"

luojiahu@ubuntu:~/learning/learngit$ git config --global user.email "luojiahu@yeah.net"

• 初始化目录为Repository:

luojiahu@ubuntu:~/learning/learngit$ git init

Initialized empty Git repository in /home/luojiahu/learning/learngit/.git/

• 文件的提交：

luojiahu@ubuntu:~/learning/learngit$ git add ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ git commit -m "add a readme file."

[master (root-commit) 849bbd2] add a readme file.
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 ReadMe.txt

• 查看当前Repository的状态信息

luojiahu@ubuntu:~/learning/learngit$ 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")

• 查看详细的文件变化内容

luojiahu@ubuntu:~/learning/learngit$ git diff ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt

index e69de29..38b41f6 100644

--- a/ReadMe.txt

+++ b/ReadMe.txt

@@ -0,0 +1 @@

+add some content.

• 查看提交日志，可以通过—pretty=oneline 限制为显示单行

luojiahu@ubuntu:~/learning/learngit$ git log

commit f2adaa19be7976661aa65228ca20ca02a83c1999

Author: luojiahu <luojiahu@yeah.net>

Date:   Tue Aug 28 08:09:00 2018 -0700

add GPL

commit 356f51ac350dca07602a5b7f4d0b6fbf7d8eb27f

Author: luojiahu <luojiahu@yeah.net>

Date:   Tue Aug 28 08:07:16 2018 -0700

add some content.

commit 849bbd2050a94e8cec1403ebdac5f1d56ad914b8

Author: luojiahu <luojiahu@yeah.net>

Date:   Tue Aug 28 07:45:18 2018 -0700

add a readme file.

luojiahu@ubuntu:~/learning/learngit$ git log --pretty=oneline

f2adaa19be7976661aa65228ca20ca02a83c1999 add GPL

356f51ac350dca07602a5b7f4d0b6fbf7d8eb27f add some content.

849bbd2050a94e8cec1403ebdac5f1d56ad914b8 add a readme file.

• Git版本的回退：

在Git中，用HEAD表示当前版本，上一各版本是HEAD^，上上个为HEAD^^，以此类推… 版本号太大是可以用类似HEAD100~表示。

可以通过git reset命令实现版本的回退，不添加—hard 参数仅仅回退当前工作版本，添加—hard 修改实际文件内容。

luojiahu@ubuntu:~/learning/learngit$ git reset HEAD^

Unstaged changes after reset:

M    ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ git log

commit 356f51ac350dca07602a5b7f4d0b6fbf7d8eb27f

Author: luojiahu <luojiahu@yeah.net>

Date:   Tue Aug 28 08:07:16 2018 -0700

add some content.

commit 849bbd2050a94e8cec1403ebdac5f1d56ad914b8

Author: luojiahu <luojiahu@yeah.net>

Date:   Tue Aug 28 07:45:18 2018 -0700

add a readme file.

回退后又后悔了怎么办？可以通过 git reflog 查看每一步的操作命令

luojiahu@ubuntu:~/learning/learngit$ git reflog

849bbd2 HEAD@{0}: reset: moving to HEAD^

356f51a HEAD@{1}: reset: moving to HEAD^

f2adaa1 HEAD@{2}: commit: add GPL

356f51a HEAD@{3}: commit: add some content.

849bbd2 HEAD@{4}: commit (initial): add a readme file.

然后，通过git reset –hard commit_id 恢复至对应的版本，commit_id不必写全

luojiahu@ubuntu:~/learning/learngit$ git reset –hard f2adaa1
HEAD is now at f2adaa1 add GPL

• 工作区与版本库：

Git 中当前的工作路径即为工作区（Working Directory），在Working Directory 下的 .git目录即为版本库（Repository）。其中版本库又分为暂存区（Stage）,Master分支，及HEAD指针等。git add 命令将修改的文件提交到Stage区，而git commit命令将暂存区的内容提交到当前的分支。

• Git 管理 “修改” 而不是 “文件”

git commit 只会将上次 git add 命令提交到 Stage 区的修改提交到当前分支，在最近一次 gti add 命令之后对文件做的修改将不会被提交。

• 撤销修改

1. 当对工作区的修改，未添加到暂存区时，可以通过：git chechout – filename 命令恢复修改
2. 当对工作区的修改已经添加到暂存区，可以通过：git reset HEAD ReadMe.txt 命令恢复暂存区，然后按照1中的步骤恢复工作区。

luojiahu@ubuntu:~/learning/learngit$ git status
On branch master
Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

modified:   ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ git reset HEAD ReadMe.txt
Unstaged changes after reset:
M    ReadMe.txt
luojiahu@ubuntu:~/learning/learngit$ 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"

luojiahu@ubuntu:~/learning/learngit$ git checkout -- ReadMe.txt
luojiahu@ubuntu:~/learning/learngit$ git status
On branch master
nothing to commit, working directory clean

删除文件

Git认为文件的删除也是一种修改操作，可以通过git rm命令实现文件的删除。如果发生误删，可以通过git reset HEAD filename + git checkout – filename 恢复文件。

luojiahu@ubuntu:~/learning/learngit$ git rm ReadMe.txt

rm 'ReadMe.txt'

luojiahu@ubuntu:~/learning/learngit$ git status

On branch master

Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

deleted:    ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ git checkout -- ReadMe.txt

error: pathspec 'ReadMe.txt' did not match any file(s) known to git.

luojiahu@ubuntu:~/learning/learngit$ git status

On branch master

Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

deleted:    ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ git reset HEAD ReadMe.txt

Unstaged changes after reset:

D    ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ 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:    ReadMe.txt

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

luojiahu@ubuntu:~/learning/learngit$ git checkout -- ReadMe.txt

luojiahu@ubuntu:~/learning/learngit$ ll

total 16

drwxrwxr-x 3 luojiahu luojiahu 4096 Sep  1 18:58 ./

drwxrwxr-x 3 luojiahu luojiahu 4096 Aug 28 07:42 ../

drwxrwxr-x 8 luojiahu luojiahu 4096 Sep  1 18:58 .git/

-rw-rw-r-- 1 luojiahu luojiahu   28 Sep  1 18:58 ReadMe.txt