``` liqing@liqing-virtual-machine:~$ sudo apt-get install git [sudo] liqing 的密码：正在读取软件包列表... 完成正在分析软件包的依赖关系树正在读取状态信息... 完成将会同时安装下列软件： git-man liberror-perl 建议安装： git-daemon-run | git-daemon-sysvinit git-doc git-el git-email git-gui gitk gitweb git-cvs git-mediawiki git-svn 下列【新】软件包将被安装： git git-man liberror-perl 升级了 0 个软件包，新安装了 3 个软件包，要卸载 0 个软件包，有 3 个软件包未被升级。需要下载 3,943 kB 的归档。解压缩后会消耗 30.4 MB 的额外空间。您希望继续执行吗？ [Y/n] y 获取:1 http://cn.archive.ubuntu.com/ubuntu artful/main amd64 liberror-perl all 0.17024-1 [23.0 kB] 获取:2 http://cn.archive.ubuntu.com/ubuntu artful/main amd64 git-man all 1:2.14.1-1ubuntu4 [790 kB] 获取:3 http://cn.archive.ubuntu.com/ubuntu artful/main amd64 git amd64 1:2.14.1-1ubuntu4 [3,130 kB] 已下载 3,943 kB，耗时 1分 2秒 (62.9 kB/s) 正在选中未选择的软件包 liberror-perl。 (正在读取数据库 ... 系统当前共安装有 152455 个文件和目录。) 正准备解包 .../liberror-perl_0.17024-1_all.deb ... 正在解包 liberror-perl (0.17024-1) ... 正在选中未选择的软件包 git-man。正准备解包 .../git-man_1%3a2.14.1-1ubuntu4_all.deb ... 正在解包 git-man (1:2.14.1-1ubuntu4) ... 正在选中未选择的软件包 git。正准备解包 .../git_1%3a2.14.1-1ubuntu4_amd64.deb ... 正在解包 git (1:2.14.1-1ubuntu4) ... 正在设置 git-man (1:2.14.1-1ubuntu4) ... 正在设置 liberror-perl (0.17024-1) ... 正在处理用于 man-db (2.7.6.1-2) 的触发器 ... 正在设置 git (1:2.14.1-1ubuntu4) ... liqing@liqing-virtual-machine:~$ sudo apt-get update 命中:1 http://cn.archive.ubuntu.com/ubuntu artful InRelease 获取:2 http://cn.archive.ubuntu.com/ubuntu artful-updates InRelease [78.6 kB] 获取:3 http://cn.archive.ubuntu.com/ubuntu artful-backports InRelease [72.2 kB] 忽略:4 http://dl.google.com/linux/chrome/deb stable InRelease 命中:5 http://dl.google.com/linux/chrome/deb stable Release 获取:7 http://cn.archive.ubuntu.com/ubuntu artful-updates/main amd64 DEP-11 Metadata [83.2 kB] 获取:8 http://cn.archive.ubuntu.com/ubuntu artful-updates/main DEP-11 64x64 Icons [54.0 kB] 获取:9 http://cn.archive.ubuntu.com/ubuntu artful-updates/universe amd64 DEP-11 Metadata [56.1 kB] 获取:10 http://cn.archive.ubuntu.com/ubuntu artful-updates/universe DEP-11 64x64 Icons [68.2 kB] 获取:11 http://security.ubuntu.com/ubuntu artful-security InRelease [78.6 kB] 获取:12 http://cn.archive.ubuntu.com/ubuntu artful-backports/universe amd64 DEP-11 Metadata [5,092 B] 获取:13 http://security.ubuntu.com/ubuntu artful-security/main amd64 DEP-11 Metadata [17.2 kB] 获取:14 http://security.ubuntu.com/ubuntu artful-security/main DEP-11 64x64 Icons [27.5 kB] 获取:15 http://security.ubuntu.com/ubuntu artful-security/universe amd64 DEP-11 Metadata [11.3 kB] 获取:16 http://security.ubuntu.com/ubuntu artful-security/universe DEP-11 64x64 Icons [12.4 kB] 已下载 564 kB，耗时 10秒 (52.1 kB/s) 正在读取软件包列表... 完成 liqing@liqing-virtual-machine:~$ git config --global user.name "liqing" liqing@liqing-virtual-machine:~$ git config --global user.email "393731192@qq.com" liqing@liqing-virtual-machine:~$ ls -al 总用量 132 drwxr-xr-x 21 liqing liqing 4096 3月 19 15:10 . drwxr-xr-x 3 root root 4096 3月 16 08:27 .. -rw------- 1 liqing liqing 4372 3月 19 13:41 .bash_history -rw-r--r-- 1 liqing liqing 220 3月 16 08:27 .bash_logout -rw-r--r-- 1 liqing liqing 3771 3月 16 08:27 .bashrc drwx------ 18 liqing liqing 4096 3月 17 17:03 .cache drwxr-xr-x 19 liqing liqing 4096 3月 17 17:03 .config -rw-r--r-- 1 liqing liqing 8980 3月 16 08:27 examples.desktop drwx------ 2 liqing liqing 4096 3月 16 10:51 .gconf -rw-r--r-- 1 liqing liqing 48 3月 19 15:10 .gitconfig drwx------ 3 liqing liqing 4096 3月 16 10:28 .gnupg -rw------- 1 liqing liqing 1528 3月 19 10:50 .ICEauthority drwxr-xr-x 3 liqing liqing 4096 3月 16 09:56 .local drwxr-xr-x 2 liqing liqing 4096 3月 17 16:25 man drwx------ 5 liqing liqing 4096 3月 16 10:10 .mozilla -rw------- 1 liqing liqing 3465 3月 17 11:48 .mysql_history drwx------ 3 liqing liqing 4096 3月 16 16:23 .pki -rw-r--r-- 1 liqing liqing 675 3月 16 08:27 .profile drwx------ 2 liqing liqing 4096 3月 16 10:50 .remmina -rw-r--r-- 1 liqing liqing 0 3月 16 10:07 .sudo_as_admin_successful drwx------ 2 liqing liqing 4096 3月 17 10:27 .sunpinyin drwx------ 2 liqing liqing 4096 3月 19 10:52 .w3m -rw-rw-r-- 1 liqing liqing 131 3月 17 09:36 .xinputrc drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 公共的 drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 模板 drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 视频 drwxr-xr-x 2 liqing liqing 4096 3月 19 10:09 图片 drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 文档 drwxr-xr-x 2 liqing liqing 4096 3月 16 15:32 下载 drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 音乐 drwxr-xr-x 2 liqing liqing 4096 3月 16 09:56 桌面 liqing@liqing-virtual-machine:~$ vim /home/liqing/.gitconfig liqing@liqing-virtual-machine:~$ git clone https://github.com/shiyanlou/gitproject 正克隆到 'gitproject'... remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0 展开对象中: 100% (3/3), 完成. liqing@liqing-virtual-machine:~$ ls examples.desktop man 模板图片下载桌面 gitproject 公共的视频文档音乐 liqing@liqing-virtual-machine:~$ cd gitproject liqing@liqing-virtual-machine:~/gitproject$ ls README.md liqing@liqing-virtual-machine:~/gitproject$ cat README.md gitproject ========== liqing@liqing-virtual-machine:~/gitproject$ cd liqing@liqing-virtual-machine:~$ cd /home/liqing liqing@liqing-virtual-machine:~$ mkdir project liqing@liqing-virtual-machine:~$ cd project liqing@liqing-virtual-machine:~/project$ git init 已初始化空的 Git 仓库于 /home/liqing/project/.git/ liqing@liqing-virtual-machine:~/project$ touch file1 file2 file3liqing@liqing-virtual-machine:~/project$ echo "test1" >> file1 liqing@liqing-virtual-machine:~/project$ echo "test2" >> file2 liqing@liqing-virtual-machine:~/project$ echo "test3" >> file3 liqing@liqing-virtual-machine:~/project$ git status 位于分支 master 尚无提交未跟踪的文件: （使用 "git add <文件>..." 以包含要提交的内容） file1 file2 file3 提交为空，但是存在尚未跟踪的文件（使用 "git add" 建立跟踪） liqing@liqing-virtual-machine:~/project$ git add file1 file2 file3 liqing@liqing-virtual-machine:~/project$ git status 位于分支 master 尚无提交要提交的变更：（使用 "git rm --cached <文件>..." 以取消暂存）新文件： file1 新文件： file2 新文件： file3 liqing@liqing-virtual-machine:~/project$ git diff --cached diff --git a/file1 b/file1 new file mode 100644 index 0000000..a5bce3f --- /dev/null +++ b/file1 @@ -0,0 +1 @@ +test1 diff --git a/file2 b/file2 new file mode 100644 index 0000000..180cf83 --- /dev/null +++ b/file2 @@ -0,0 +1 @@ +test2 diff --git a/file3 b/file3 new file mode 100644 index 0000000..df6b0d2 --- /dev/null +++ b/file3 @@ -0,0 +1 @@ +test3 liqing@liqing-virtual-machine:~/project$ git commit -m "add 3 files" [master （根提交） e390764] add 3 files 3 files changed, 3 insertions(+) create mode 100644 file1 create mode 100644 file2 create mode 100644 file3 liqing@liqing-virtual-machine:~/project$ git status 位于分支 master 无文件要提交，干净的工作区 liqing@liqing-virtual-machine:~/project$ git remote add origin https://github.com/liqing45/shiyanlou.git liqing@liqing-virtual-machine:~/project$ git push -u origin master Username for 'https://github.com': liqing45 Password for 'https://liqing45@github.com': 对象计数中: 5, 完成. 压缩对象中: 100% (2/2), 完成. 写入对象中: 100% (5/5), 288 bytes | 72.00 KiB/s, 完成. Total 5 (delta 0), reused 0 (delta 0) To https://github.com/liqing45/shiyanlou.git * [new branch] master -> master 分支 master 设置为跟踪来自 origin 的远程分支 master。 liqing@liqing-virtual-machine:~/project$ git branch experimentalliqing@liqing-virtual-machine:~/project$ git branch experimental * master liqing@liqing-virtual-machine:~/project$ git checkout experimental 切换到分支 'experimental' liqing@liqing-virtual-machine:~/project$ echo "update" >>file1 liqing@liqing-virtual-machine:~/project$ git status 位于分支 experimental 尚未暂存以备提交的变更：（使用 "git add <文件>..." 更新要提交的内容）（使用 "git checkout -- <文件>..." 丢弃工作区的改动）修改： file1 修改尚未加入提交（使用 "git add" 和/或 "git commit -a"） liqing@liqing-virtual-machine:~/project$ git add file1 liqing@liqing-virtual-machine:~/project$ git commit -m "update file1" [experimental 78fd0fc] update file1 1 file changed, 1 insertion(+) liqing@liqing-virtual-machine:~/project$ cat file1 test1 update liqing@liqing-virtual-machine:~/project$ git checkout master 切换到分支 'master' 您的分支与上游分支 'origin/master' 一致。 liqing@liqing-virtual-machine:~/project$ cat file1 test1 liqing@liqing-virtual-machine:~/project$ echo "update again" >> file2 liqing@liqing-virtual-machine:~/project$ git status 位于分支 master 您的分支与上游分支 'origin/master' 一致。尚未暂存以备提交的变更：（使用 "git add <文件>..." 更新要提交的内容）（使用 "git checkout -- <文件>..." 丢弃工作区的改动）修改： file2 修改尚未加入提交（使用 "git add" 和/或 "git commit -a"） liqing@liqing-virtual-machine:~/project$ git aa file2 git：'aa' 不是一个 git 命令。参见 'git --help'。最相似的命令是 am liqing@liqing-virtual-machine:~/project$ git add file2 liqing@liqing-virtual-machine:~/project$ git commit -m "update file2 on master" [master 5cd3d16] update file2 on master 1 file changed, 1 insertion(+) liqing@liqing-virtual-machine:~/project$ cat file2 test2 update again liqing@liqing-virtual-machine:~/project$ git checkout master 已经位于 'master' 您的分支领先 'origin/master' 共 1 个提交。（使用 "git push" 来发布您的本地提交） liqing@liqing-virtual-machine:~/project$ git merge -m 'merge exeprimental branch' experimental Merge made by the 'recursive' strategy. file1 | 1 + 1 file changed, 1 insertion(+) liqing@liqing-virtual-machine:~/project$ git branch -d exeprimental error: 分支 'exeprimental' 未发现。 liqing@liqing-virtual-machine:~/project$ git branch -d exeperimental error: 分支 'exeperimental' 未发现。 liqing@liqing-virtual-machine:~/project$ git log commit 53fdc8fae9335d6f382648644b624ce895b848e1 (HEAD -> master) Merge: 5cd3d16 78fd0fc Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:32:23 2018 +0800 merge exeprimental branch commit 5cd3d1615204c49be830873f3cb6659750e6e912 Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:30:29 2018 +0800 update file2 on master commit 78fd0fcba0c248ac95b3e756333a0205821c2c11 (experimental) Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:28:34 2018 +0800 update file1 commit e3907649fe9322fe3bb024277b958a749367c9ea (origin/master) Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:20:03 2018 +0800 liqing@liqing-virtual-machine:~/project$ git log --stat commit 53fdc8fae9335d6f382648644b624ce895b848e1 (HEAD -> master) Merge: 5cd3d16 78fd0fc Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:32:23 2018 +0800 merge exeprimental branch commit 5cd3d1615204c49be830873f3cb6659750e6e912 Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:30:29 2018 +0800 update file2 on master file2 | 1 + 1 file changed, 1 insertion(+) commit 78fd0fcba0c248ac95b3e756333a0205821c2c11 (experimental) Author: liqing <393731192@qq.com> Date: Mon Mar 19 15:28:34 2018 +0800 update file1 file1 | 1 + liqing@liqing-virtual-machine:~/project$ git log --graph --pretty=online fatal: invalid --pretty format: online liqing@liqing-virtual-machine:~/project$ git log --graph --pretty=oneline * 53fdc8fae9335d6f382648644b624ce895b848e1 (HEAD -> master) merge exeprimental branch |\ | * 78fd0fcba0c248ac95b3e756333a0205821c2c11 (experimental) update file1 * | 5cd3d1615204c49be830873f3cb6659750e6e912 update file2 on master |/ * e3907649fe9322fe3bb024277b958a749367c9ea (origin/master) add 3 files liqing@liqing-virtual-machine:~/project$ git log --pretty=format:'%h : %s' --topo-order --graph * 53fdc8f : merge exeprimental branch |\ | * 78fd0fc : update file1 * | 5cd3d16 : update file2 on master |/ * e390764 : add 3 files liqing@liqing-virtual-machine:~/project$ git push -u origin master Username for 'https://github.com': liqing45 Password for 'https://liqing45@github.com': 对象计数中: 8, 完成. 压缩对象中: 100% (6/6), 完成. 写入对象中: 100% (8/8), 802 bytes | 267.00 KiB/s, 完成. Total 8 (delta 1), reused 0 (delta 0) remote: Resolving deltas: 100% (1/1), done. To https://github.com/liqing45/shiyanlou.git e390764..53fdc8f master -> master 分支 master 设置为跟踪来自 origin 的远程分支 master。 ``` ![图片描](https://dnsimplecloud.shiyanlou.com/uid/603568/1521445514366.png-wm)

“Git 实战教程”实验报告