ragpo
ragpo

极客时间 Git 学习笔记

01 | 课程综述

1

2

3

4

02 | 安装Git

1

https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git

  • mac 安装
    https://git-scm.com/download/mac

  • 查看安装版本

 git --version

03 | 使用Git之前需要做的最小配置

  • 配置 user 信息
    主要是为了在commit的时候能够添加上提交者的相关信息，方便在代码审查的时候知道提交人是谁，方便联系。
git config --global user.name "zhangshaopo"
git config --global user.email "[email protected]"
  • 有三种级别的user信息，缺省等同于 local。
git config --local     # local只对仓库有效
git config --global   # global对登录⽤户所有仓库有效
git config --system # system对系统的所有⽤户有效，一般不用
  • 显示 config 的配置，加 --list
git config --list --local
git config --list --global
git config --list --system
  • 清除，--unset
git config --unset --local user.name
git config --unset --global user.name
git config --unset --system user.name
  • 优先级
local > global > system

04 | 创建第一个仓库并配置local用户信息

1
  • 创建一个库
git init git-learning-1
  • 配置 user 信息
cd git-learning-1
git config --local user.email "[email protected]"
git config --local user.name "apo"
  • 创建一个README.md文件，内容如下：
line1
  • 查看状态
$ git status
On branch master

No commits yet

Untracked files:
  (use "git add ..." to include in what will be committed)
    README.md

nothing added to commit but untracked files present (use "git add" to track)
  • 添加到占存区
git add README.md
  • 查看状态
$ git status
On branch master

No commits yet

Changes to be committed:
  (use "git rm --cached ..." to unstage)
    new file:   README.md
  • commit
$ git commit -m"add README.md"
[master (root-commit) beab99b] add README.md
 1 file changed, 1 insertion(+)
 create mode 100644 README.md
  • 查看状态
$ git status
On branch master
nothing to commit, working tree clean
  • 查看日志

可以看到Author是我们设置的名称和邮件

$ git log
commit beab99bb7d4887a05e322483e65db7e569af2bce (HEAD -> master)
Author: zhangshaopo 
Date:   Wed Jun 3 17:51:13 2020 +0800

    add README.md

    add README.md

05 | 通过几次commit来认识工作区和暂存区

1
  • 添加两个文件a和b
$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)
    a
    b

$ git add a b

$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    new file:   a
    new file:   b
  • 用 git restore --staged 将通过add添加到暂存区的a文件进行回退
git restore --staged a
  • 查看状态
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    new file:   b

Untracked files:
  (use "git add ..." to include in what will be committed)
    a
  • 将a和b文件进行commit提交
$ git add a
$ git commit -m"add a and b"
[master 8bfc512] add a and b
 2 files changed, 2 insertions(+)
 create mode 100644 a
 create mode 100644 b
  • 修改a和b的内容，通过 git add -u 同时添加多个文件到暂存区
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   a
    modified:   b

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

$ git add -u

$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    modified:   a
    modified:   b

$ git commit -m"modify a and b"
[master a7ec957] modify a and b
 2 files changed, 2 insertions(+), 2 deletions(-)

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

06 | 给文件重命名的简便方法

以下使用旧的方法，将a命名为aa

$ mv a aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:26]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  3 21:37 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 b

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:27]
$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    deleted:    a

Untracked files:
  (use "git add ..." to include in what will be committed)
    aa

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

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:29]
$ git add aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:39]
$ git add a

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:43]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    renamed:    a -> aa


# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:38:47]
$ git commit -m"rename a to aa"
[master 19954dc] rename a to aa
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename a => aa (100%)

以下使用简便方法重命名文件b文件为bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:39:00]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  3 21:37 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 b

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:44:06]
$ git mv b bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:44:11]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    renamed:    b -> bb


# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:44:13]
$ git commit -m"rename b to bb"
[master 76e6152] rename b to bb
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename b => bb (100%)

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:44:26]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  3 21:37 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 bb

删除文件

可以通过使用Linux的rm命令删除，然后再通过git add或者git rm更新到暂存区；也可以直接通过git rm删除文件并更新到暂存区。

  • 通过通过使用Linux的rm命令删除，然后再通过git add或者git rm更新到暂存区
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:58:07]
$ rm -f aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:15]
$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    deleted:    aa

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

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:27] C:128
$ git add aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:31] C:1
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    deleted:    aa


# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:33]
$ ll
total 16
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:37]
$ git restore --staged aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:48]
$ ll
total 16
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:50]
$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    deleted:    aa

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

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:58:54]
$ git restore aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:59:05]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  3 21:59 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 bb
  • 直接通过git rm删除文件并更新到暂存区
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [21:59:07]
$ git rm aa
rm 'aa'

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:59:12]
$ ll
total 16
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 21:17 bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [21:59:14]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    deleted:    aa
  • 通过git reset --hard将工作区和暂存区的删除或者修改的内容回退到上一次commit的的状态，但是新增的文件不会。
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:04:43]
$ git reset --hard
HEAD is now at 76e6152 rename b to bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [22:05:49]
$ vi aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:05:57]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa

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

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:05:59]
$ git rm bb
rm 'bb'

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:06:13]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    deleted:    bb

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa


# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:06:17]
$ ll
total 16
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     4B Jun  3 22:05 aa

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [22:06:18]
$ git reset --hard
HEAD is now at 76e6152 rename b to bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [22:06:36]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  3 22:06 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  3 22:06 bb

07 | 通过git log查看版本演变历史

  • 查看最近4个commit
$ git log -n 4
commit 76e615246f84c4f4d9f1e8142ab4b5899595780f (HEAD -> master)
Author: zhangshaopo 
Date:   Wed Jun 3 21:44:26 2020 +0800

    rename b to bb

commit 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
Author: zhangshaopo 
Date:   Wed Jun 3 21:39:00 2020 +0800

    rename a to aa

commit f2b8ff652c66b6cce31a95dfa6ded61273867523
Author: zhangshaopo 
Date:   Wed Jun 3 21:34:42 2020 +0800

    a

commit ab4396fd4c9558a2c822442b8303f94d5e4d3a87
Author: zhangshaopo 
Date:   Wed Jun 3 21:31:47 2020 +0800

    rm a
  • 将commit信息单行输出
$ git log -n4 --oneline
76e6152 (HEAD -> master) rename b to bb
19954dc rename a to aa
f2b8ff6 a
ab4396f rm a
  • 查看分支并创建分支
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [22:28:59]
$ git branch -v
* master 76e6152 rename b to bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [22:29:17]
$ git checkout -b temp f2b8ff652c66b6cce31a95dfa6ded61273867523
Switched to a new branch 'temp'

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:temp o [22:35:23]
$ git branch -v
  master 76e6152 rename b to bb
* temp   f2b8ff6 a
  • 默认使用git log查看的是当前分支的log，命令行图形化查看所有分支情况
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:temp o [22:40:44]
$ git log --all --graph
* commit bb4ef28c6e993c11c6265343e03ccb7f9c91785f (HEAD -> temp)
| Author: zhangshaopo 
| Date:   Wed Jun 3 22:40:09 2020 +0800
|
|     add c
|
| * commit 76e615246f84c4f4d9f1e8142ab4b5899595780f (master)
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 21:44:26 2020 +0800
| |
| |     rename b to bb
| |
| * commit 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
|/  Author: zhangshaopo 
|   Date:   Wed Jun 3 21:39:00 2020 +0800
|
|       rename a to aa
|
* commit f2b8ff652c66b6cce31a95dfa6ded61273867523
| Author: zhangshaopo 
| Date:   Wed Jun 3 21:34:42 2020 +0800
|
|     a
|
* commit ab4396fd4c9558a2c822442b8303f94d5e4d3a87
| Author: zhangshaopo 
| Date:   Wed Jun 3 21:31:47 2020 +0800
|
|     rm a
|
* commit a7ec957015686e3de8665ee89cf786c6fcc18078
| Author: zhangshaopo 
| Date:   Wed Jun 3 21:17:50 2020 +0800
|
|     modify a and b
|
* commit 8bfc512425422e0f85a3397a18faf84388522fe1
| Author: zhangshaopo 
| Date:   Wed Jun 3 21:16:15 2020 +0800
  • 简洁输出
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:temp o [22:48:28] C:130
$ git log --graph --all --oneline
* bb4ef28 (HEAD -> temp) add c
| * 76e6152 (master) rename b to bb
| * 19954dc rename a to aa
|/
* f2b8ff6 a
* ab4396f rm a
* a7ec957 modify a and b
* 8bfc512 add a and b
* beab99b add README.md
  • 查看其他分支log，如指定master
$ git log --graph  --oneline master
  • 查看log命令的web手册，我这里没有加载成功。
git help --web log
fatal: HTML documentation is not provided by this distribution of git.

08 | gitk：通过图形界面工具来查看版本历史

  • 在命令行输入gitk，会弹出窗口


    1

  • 修改字体大小


    2

  • 修改展示页内容，我这里选择所有分支


    3

  • 就能看到所有的分支及关系


    4

  • patch是对比前后两次文件区别，在comment下选择本次commit变动的文件，会显示文件不同的地方，绿色是这次，红色是上次


    5

  • tree是显示本次commit所有的文件，包括变动和没有变动的


    6

  • 其他信息


    7

09 | 探密.git目录

  • 查看HEAD

HEAD的内容是指向 refs/heads/，指代当前在哪个分支下面

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:temp o [15:14:21]
$ cd .git

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:14:23]
$ ll
total 56
-rw-r--r--   1 zhangshaopo  staff     2B Jun  3 23:22 COMMIT_EDITMSG
-rw-r--r--   1 zhangshaopo  staff    21B Jun  3 22:30 HEAD
-rw-r--r--   1 zhangshaopo  staff    41B Jun  3 22:06 ORIG_HEAD
-rw-r--r--   1 zhangshaopo  staff   194B Jun  3 22:45 config
-rw-r--r--   1 zhangshaopo  staff    73B Jun  3 17:50 description
-rw-r--r--   1 zhangshaopo  staff   789B Jun  3 23:22 gitk.cache
drwxr-xr-x  14 zhangshaopo  staff   448B Jun  3 17:50 hooks
-rw-r--r--   1 zhangshaopo  staff   329B Jun  3 23:22 index
drwxr-xr-x   3 zhangshaopo  staff    96B Jun  3 17:50 info
drwxr-xr-x   4 zhangshaopo  staff   128B Jun  3 17:51 logs
drwxr-xr-x  30 zhangshaopo  staff   960B Jun  3 23:22 objects
drwxr-xr-x   4 zhangshaopo  staff   128B Jun  3 17:50 refs

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:14:24]
$ cat HEAD
ref: refs/heads/temp

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:14:28]
$ ll refs/heads
total 16
-rw-r--r--  1 zhangshaopo  staff    41B Jun  3 21:44 master
-rw-r--r--  1 zhangshaopo  staff    41B Jun  3 23:22 temp


# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:14:35]
$ git branch -v
  master 76e6152 rename b to bb
* temp   e5d61ab a

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:38:52]
$ git checkout master
fatal: this operation must be run in a work tree

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:temp o [15:39:01] C:128
$ cd ..

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:temp o [15:39:04]
$ git checkout master
Switched to branch 'master'

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [15:39:12] C:1
$ cd -
~/git-learning-1/.git

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:39:16]
$ cat HEAD
ref: refs/heads/master

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:39:20]
$ git branch -v
* master 76e6152 rename b to bb
  temp   e5d61ab a
  • config

config文件里面的user字段可以通过命令行来设置，也可以通过命令来获取，如果修改了文件，命令行也是能读取到的。

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:54:52]
$ git config --local --list
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
core.precomposeunicode=true
gui.wmstate=normal
gui.geometry=871x447+5+28 192 201
user.name=apo
[email protected]

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:54:47]
$ cat config
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    ignorecase = true
    precomposeunicode = true
[gui]
    wmstate = normal
    geometry = 871x447+5+28 192 201
[user]
    name = apo
    email = [email protected]

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:55:03]
$ git config --local user.name
apo

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [15:57:12]
$ git config --local user.email
[email protected]
  • refs

refs里面包含了本repo所包含的分支（head）和tag，例如master分支的内容，就是某次commit，git cat-file -t是查看这个哈希值所代表的类型，-p就展示这个哈希值的内容。

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:03]
$ ll refs
total 0
drwxr-xr-x  4 zhangshaopo  staff   128B Jun  3 23:22 heads
drwxr-xr-x  2 zhangshaopo  staff    64B Jun  3 17:50 tags

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:09]
$ ll refs/heads
total 16
-rw-r--r--  1 zhangshaopo  staff    41B Jun  3 21:44 master
-rw-r--r--  1 zhangshaopo  staff    41B Jun  3 23:22 temp

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:17]
$ cat refs/heads/master
76e615246f84c4f4d9f1e8142ab4b5899595780f

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:24]
$ git cat-file -t 76e615246
commit

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:35]
$ git cat-file -p 76e615246
tree cda2191fe0021fce14fca113c92b64551ec96649
parent 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
author zhangshaopo  1591191866 +0800
committer zhangshaopo  1591191866 +0800

rename b to bb
# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:05:41]
$ git cat-file -p cda2191fe00
100644 blob a29bdeb434d874c9b1d8969c40c42161b03fafdc    README.md
100644 blob 78981922613b2afb6025042ff6bd878ac1994e85    aa
100644 blob e0b3f1b09bd1819ed1f7ce2e75fc7400809f5350    bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:06:05]
$ git cat-file -p a29bdeb
line1
  • object

object里面包含了对象，分为tree、commit、blob、tag，tree可以理解为一个文件夹，里面包含了blob，blob可以理解为是一个具体的文件，通过git cat-file -p可以看到内容，tag类似一个开发阶段成果，基于某次commit。

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:29:09]
$ ll objects
total 0
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:39 19
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:34 1c
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:39 21
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:20 31
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:20 48
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:22 57
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:17 5f
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 22:39 6a
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:44 76
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:06 78
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 17:51 81
drwxr-xr-x  5 zhangshaopo  staff   160B Jun  3 21:31 8b
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 17:50 a2
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:17 a7
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:22 aa
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:31 ab
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 22:40 bb
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 17:51 be
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 22:40 c1
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:16 c8
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:44 cd
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:17 e0
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:22 e5
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:17 e6
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 21:34 f2
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  3 23:20 fe
drwxr-xr-x  2 zhangshaopo  staff    64B Jun  3 17:50 info
drwxr-xr-x  2 zhangshaopo  staff    64B Jun  3 17:50 pack

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:29:21]
$ ll objects/fe
total 8
-r--r--r--  1 zhangshaopo  staff   130B Jun  3 23:20 046b7ede257c4825ef25e2845b3d08dbd9104c

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:29:31]
$ git cat-file -t fe046b7ede257c4825ef25e2845b3d08dbd9104c
tree

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:29:41]
$ git cat-file -p fe046b7ede257c4825ef25e2845b3d08dbd9104c
100644 blob a29bdeb434d874c9b1d8969c40c42161b03fafdc    README.md
100644 blob 318861bb2b0af2638b377456f52e77c5ff646f2a    a
100644 blob e0b3f1b09bd1819ed1f7ce2e75fc7400809f5350    b
100644 blob 6a69f92020f5df77af6e8813ff1232493383b708    c

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:29:50]
$ git cat-file -t a29bdeb434d874c9b1d8969c40c42161b03fafdc
blob

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1/.git on git:master o [16:30:08]
$ git cat-file -p a29bdeb434d874c9b1d8969c40c42161b03fafdc
line1

10 | commit、tree和blob三个对象之间的关系

1

一次commit就对应着对当前时间仓库内的所有文件做了一次快照；一次commit对应着一个tree，tree类似文件夹，一个tree下面又可以包含多个tree，tree下面可以包含文件，也就是blob，但是blob没有具体名字，因为git的存储机制是基于相同文件的内容就认为是同一个blob，在有多个文件时，就能节省实际的存储空间。

11 | 小练习：数一数tree的个数

1

一次commit，至少包含本身一个tree，因为又包含一个目录doc，所以又会有个tree，doc下面包含一个文件，也是就blob，所以一共有2个tree，1个blob。

12 | 分离头指针情况下的注意事项

分离头指针说的是当前我们的工作不在具体的某个分支上进行，而是在一个没有分支的状态下工作，这种状态是同样可以commit，一般的用处就是仅仅做个测试验证，可以随时不要，只需要执行git checkout某个分支就可以丢弃了，但是git会提示你，是否需要将在分离头指针情况下的commit生成一个分支。分离头指针一般是基于某个commit生成的。

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:23:27]
$ git checkout a7ec957015686e3de8
Note: switching to 'a7ec957015686e3de8'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c 

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at a7ec957 modify a and b

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 o [19:23:32]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     3B Jun  4 19:23 a
-rw-r--r--  1 zhangshaopo  staff     3B Jun  4 19:23 b

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 o [19:23:46]
$ touch detached-file

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 x [19:23:59]
$ vi detached-file

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 x [19:24:12]
$ git commit -am"detached"
HEAD detached at a7ec957
Untracked files:
    detached-file

nothing added to commit but untracked files present

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 x [19:24:22] C:1
$ git add detached-file

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:a7ec957 x [19:24:33]
$ git commit -am"detached"
[detached HEAD 1375d76] detached
 1 file changed, 1 insertion(+)
 create mode 100644 detached-file

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:1375d76 o [19:24:34]
$ git status
HEAD detached from a7ec957
nothing to commit, working tree clean

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:1375d76 o [19:24:39]
$ git log
commit 1375d760e4b4b7173f7b2ffd9ac90e1b33ec431e (HEAD)
Author: apo 
Date:   Thu Jun 4 19:24:34 2020 +0800

    detached

commit a7ec957015686e3de8665ee89cf786c6fcc18078
Author: zhangshaopo 
Date:   Wed Jun 3 21:17:50 2020 +0800

    modify a and b

commit 8bfc512425422e0f85a3397a18faf84388522fe1
Author: zhangshaopo 
Date:   Wed Jun 3 21:16:15 2020 +0800

    add a and b

$ git checkout master
Warning: you are leaving 1 commit behind, not connected to
any of your branches:

  1375d76 detached

If you want to keep it by creating a new branch, this may be a good time
to do so with:

 git branch  1375d76

Switched to branch 'master'

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:29:28]
$ git log --graph  --all
* commit e5d61ab172f1cc308cddfd01b496d6e8a73e7170 (temp)
| Author: zhangshaopo 
| Date:   Wed Jun 3 23:22:41 2020 +0800
|
|     a
|
* commit 480b474878cb9dac78aa4fa00bae6ef0be264701
| Author: zhangshaopo 
| Date:   Wed Jun 3 23:20:31 2020 +0800
|
|     modify a
|
* commit bb4ef28c6e993c11c6265343e03ccb7f9c91785f
| Author: zhangshaopo 
| Date:   Wed Jun 3 22:40:09 2020 +0800
|
|     add c
|
| * commit 76e615246f84c4f4d9f1e8142ab4b5899595780f (HEAD -> master)
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 21:44:26 2020 +0800
| |
| |     rename b to bb
| |
| * commit 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
|/  Author: zhangshaopo 
|   Date:   Wed Jun 3 21:39:00 2020 +0800
|
|       rename a to aa
|
* commit f2b8ff652c66b6cce31a95dfa6ded61273867523
| Author: zhangshaopo 
| Date:   Wed Jun 3 21:34:42 2020 +0800
|
|     a
|

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:29:41]
$ git branch detached 1375d76

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:30:43]
$ git log --graph  --all
* commit 1375d760e4b4b7173f7b2ffd9ac90e1b33ec431e (detached)
| Author: apo 
| Date:   Thu Jun 4 19:24:34 2020 +0800
|
|     detached
|
| * commit e5d61ab172f1cc308cddfd01b496d6e8a73e7170 (temp)
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 23:22:41 2020 +0800
| |
| |     a
| |
| * commit 480b474878cb9dac78aa4fa00bae6ef0be264701
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 23:20:31 2020 +0800
| |
| |     modify a
| |
| * commit bb4ef28c6e993c11c6265343e03ccb7f9c91785f
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 22:40:09 2020 +0800
| |
| |     add c
| |
| | * commit 76e615246f84c4f4d9f1e8142ab4b5899595780f (HEAD -> master)
| | | Author: zhangshaopo 
| | | Date:   Wed Jun 3 21:44:26 2020 +0800
| | |
| | |     rename b to bb
| | |
| | * commit 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
| |/  Author: zhangshaopo 
| |   Date:   Wed Jun 3 21:39:00 2020 +0800
| |
| |       rename a to aa
| |
| * commit f2b8ff652c66b6cce31a95dfa6ded61273867523
| | Author: zhangshaopo 
| | Date:   Wed Jun 3 21:34:42 2020 +0800

13 | 进一步理解HEAD和branch

head可以指向某个branch或者某个tag，其实具体的就是某个commit，因为一个branch的状态会随着commit的提交不断发生变化，所以head可以直接指代某个commit。比如通过git diff来比较不同commit之间的差异时，可以使用commit id，也可以使用head，如果使用head的话，默认是head指代的就是当前分支的最新commit。

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:47:29]
$ vi cc

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [19:47:40]
$ git add cc

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master x [19:47:43]
$ git commit -m"add cc"
[master 7d69805] add cc
 1 file changed, 1 insertion(+)
 create mode 100644 cc

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:47:49]
$ git log
commit 7d69805ff3340df16389385d86f026c687d9d3cb (HEAD -> master)
Author: apo 
Date:   Thu Jun 4 19:47:49 2020 +0800

    add cc

commit 76e615246f84c4f4d9f1e8142ab4b5899595780f
Author: zhangshaopo 
Date:   Wed Jun 3 21:44:26 2020 +0800

    rename b to bb

# zhangshaopo @ zhangshopodeMBP in ~/git-learning-1 on git:master o [19:48:01]
$ git diff 7d69805ff 76e61524
diff --git a/cc b/cc
deleted file mode 100644
index 28924d0..0000000
--- a/cc
+++ /dev/null
@@ -1 +0,0 @@
-cccc

使用HEAD来指代当前分支commit，HEAD1或者HEAD~1指代上一个commit，HEAD^或者HEAD~2指代上上一个commit.

14 | 怎么删除不需要的分支？

使用git branch -d或者git branch -D进行删除分支，-D是强制确认删除。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:10:16]
$ git branch -av
  detached 1375d76 detached
* master   7d69805 add cc
  temp     e5d61ab a

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:15:19] C:1
$ git branch -d detached
error: The branch 'detached' is not fully merged.
If you are sure you want to delete it, run 'git branch -D detached'.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:15:31] C:1
$ git branch -D detached
Deleted branch detached (was 1375d76).

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:15:38]
$ git branch -av
  * master 7d69805 add cc
  temp   e5d61ab a

15 | 怎么修改最新commit的message？

通过git commit --amend命令修改当前的commit的message信息。

16 | 怎么修改老旧commit的message？

通过使用git rebase -i 指定commit的父commit id，进入一个文件交互框，然后将pick修改为reword/r，然后保存退出，会再进行一个文件交互框，这个时候修改commit信息，再保存退出。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:47:28]
$ git --no-pager log -n3
commit 8c45faa517d496d409a37e8a1f004cfe7bb7d333 (HEAD -> master)
Author: apo 
Date:   Thu Jun 4 19:47:49 2020 +0800

    zhangshaopo add cc

commit c7f6685ffbcc93bd33a8ac0e5e8a8948a5219128
Author: zhangshaopo 
Date:   Wed Jun 3 21:44:26 2020 +0800

    rename b to bb

commit 19954dc4c1ab9ec9c49c969a5f19476abd7e34c7
Author: zhangshaopo 
Date:   Wed Jun 3 21:39:00 2020 +0800

    rename a to aa

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [20:47:29]
$ git rebase -i 19954dc4c1ab9ec
pick c7f6685 rename b to bb
pick 8c45faa zhangshaopo add cc

# Rebase 19954dc..8c45faa onto 19954dc (2 commands)
#
# Commands:
# p, pick  = use commit
# r, reword  = use commit, but edit the commit message
# e, edit  = use commit, but stop for amending
# s, squash  = use commit, but meld into previous commit
# f, fixup  = like "squash", but discard this commit's log message
# x, exec  = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop  = remove commit
# l, label

17 | 怎样把连续的多个commit整理成1个？

$ git --no-pager log --oneline
44eefcc (HEAD -> master) zhangshaopo add cc
0c10858 zhangshaopo rename b to bb
19954dc rename a to aa
f2b8ff6 a
ab4396f rm a
a7ec957 modify a and b
8bfc512 add a and b
beab99b add README.md

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [21:04:09]
$ git rebase -i beab99bb7d
[detached HEAD a1cc254] add a and b
 Author: zhangshaopo 
 Date: Wed Jun 3 21:16:15 2020 +0800
 3 files changed, 3 insertions(+)
 create mode 100644 aa
 create mode 100644 bb
 create mode 100644 cc
Successfully rebased and updated refs/heads/master.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [21:06:42]
$ git --no-pager log
commit a1cc25402f6fd31ae654baa76e5b91ce3169fc08 (HEAD -> master)
Author: zhangshaopo 
Date:   Wed Jun 3 21:16:15 2020 +0800

    add a and b

    modify a and b

    rm a

    a

    rename a to aa

    zhangshaopo rename b to bb

    zhangshaopo add cc

commit beab99bb7d4887a05e322483e65db7e569af2bce
Author: zhangshaopo 
Date:   Wed Jun 3 17:51:13 2020 +0800

    add README.md

18 | 怎样把间隔的几个commit整理成1个？

不想写了，有点报错。

19 | 怎么比较暂存区和HEAD所含文件的差异？

在修改完文件，add后添加到暂存区，想比较暂存区与HEAD区别，可以通过git diff --cached进行比较

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [22:09:38]
$ vi cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [22:10:06]
$ git add cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [22:10:08]
$ git --no-pager diff --cached
diff --git a/cc b/cc
index 566c958..654a75a 100644
--- a/cc
+++ b/cc
@@ -1 +1 @@
-c-22
+cx-22

20 | 怎么比较工作区和暂存区所含文件的差异？

git --no-pager diff，另外可以通过在后面加上文件名指定显示，否则默认是展示所有文件的不同点

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [22:21:24]
$ git --no-pager diff
diff --git a/aa b/aa
index 7898192..717f8ed 100644
--- a/aa
+++ b/aa
@@ -1 +1 @@
-a
+ninina
diff --git a/cc b/cc
index 566c958..6129777 100644
--- a/cc
+++ b/cc
@@ -1 +1 @@
-c-22
+xxxc-22

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [22:21:26]
$ git --no-pager diff aa
diff --git a/aa b/aa
index 7898192..717f8ed 100644
--- a/aa
+++ b/aa
@@ -1 +1 @@
-a
+ninina

21 | 如何让暂存区恢复成和HEAD的一样？

可以通过git restore --staged指定文件恢复，或者git reset HEAD

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [8:29:05]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa
    modified:   cc

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [8:53:49]
$ git add aa cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [8:58:57]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    modified:   aa
    modified:   cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:12:01]
$ git --no-pager diff --cached
diff --git a/aa b/aa
index 7898192..717f8ed 100644
--- a/aa
+++ b/aa
@@ -1 +1 @@
-a
+ninina
diff --git a/cc b/cc
index 566c958..6129777 100644
--- a/cc
+++ b/cc
@@ -1 +1 @@
-c-22
+xxxc-22

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:12:12]
$ git restore --staged
fatal: you must specify path(s) to restore

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:13:50] C:128
$ git restore --staged aa cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:14:00]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa
    modified:   cc

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:14:05]
$ git add aa cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:14:54]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    modified:   aa
    modified:   cc


# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:14:56]
$ git reset HEAD
Unstaged changes after reset:
M   aa
M   cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:15:05]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa
    modified:   cc

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

22 | 如何让工作区的文件恢复为和暂存区一样？

git restore 文件名

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:45:52]
$ cat cc
xxxc-22

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:46:04]
$ git --no-pager diff cc
diff --git a/cc b/cc
index 566c958..6129777 100644
--- a/cc
+++ b/cc
@@ -1 +1 @@
-c-22
+xxxc-22

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:46:12]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   cc

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [10:46:25]
$ git restore cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [10:46:31]
$ cat cc
c-22

23 | 怎样取消暂存区部分文件的更改？

git restore --staged 文件名

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:14:07] C:1
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:14:10]
$ git add aa

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:14:28]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    modified:   aa


# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:14:30]
$ git restore --staged aa

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:14:42]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   aa

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

24 | 消除最近的几次提交

恢复到某次commit，git reset --hard 51e9dc395，工作区和暂存区都会变成对应commit文件状态

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:31:21]
$ git log
commit e15c04bfbd79796b56b241bf47e1e9daf2101071 (HEAD -> master)
Author: apo 
Date:   Fri Jun 5 11:07:19 2020 +0800

    jj2

commit f12bd4b520023986aa17ec4a397c74c03ea32399
Author: apo 
Date:   Fri Jun 5 11:06:54 2020 +0800

    jj

commit 51e9dc3955215120a4094e18d6c691e76c6324de
Author: apo 
Date:   Thu Jun 4 22:00:09 2020 +0800

    combine add and 2

commit 38457f22dec999493e4bab764eedb785140c450d
Author: zhangshaopo 
Date:   Wed Jun 3 21:16:15 2020 +0800

    zhangshaopo add file

commit beab99bb7d4887a05e322483e65db7e569af2bce
Author: zhangshaopo 
Date:   Wed Jun 3 17:51:13 2020 +0800

    add README.md

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:31:23]
$ git reset --help

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:31:59]
$ git reset --hard 51e9dc395
HEAD is now at 51e9dc3 combine add and 2

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:32:09]
$ git log
commit 51e9dc3955215120a4094e18d6c691e76c6324de (HEAD -> master)
Author: apo 
Date:   Thu Jun 4 22:00:09 2020 +0800

    combine add and 2

commit 38457f22dec999493e4bab764eedb785140c450d
Author: zhangshaopo 
Date:   Wed Jun 3 21:16:15 2020 +0800

    zhangshaopo add file

commit beab99bb7d4887a05e322483e65db7e569af2bce
Author: zhangshaopo 
Date:   Wed Jun 3 17:51:13 2020 +0800

    add README.md

25 | 看看不同提交的指定文件的差异

通过git diff指定分支或者commit，分支其实也是一个具体的commit，还可以加上比对的文件，否则是比对所有文件。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:40:10]
$ git diff beab99b 51e9dc395
diff --git a/aa b/aa
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/aa
@@ -0,0 +1 @@
+a
diff --git a/bb b/bb
new file mode 100644
index 0000000..e0b3f1b
--- /dev/null
+++ b/bb
@@ -0,0 +1 @@
+bb
diff --git a/cc b/cc
new file mode 100644
index 0000000..566c958
--- /dev/null
+++ b/cc
@@ -0,0 +1 @@
+c-22

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:40:20]
$ git diff beab99b 51e9dc395 aa
diff --git a/aa b/aa
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/aa
@@ -0,0 +1 @@
+a

26 | 正确删除文件的方法

可以通过使用Linux的rm命令删除，然后再通过git add或者git rm更新到暂存区；也可以直接通过git rm删除文件并更新到暂存区。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:54:48]
$ ll
total 32
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 11:32 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  4 21:22 bb
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 11:32 cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:54:50]
$ rm -f cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:54:55]
$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    deleted:    cc

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:54:57]
$ git add cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:55:01]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    deleted:    cc


# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:55:04]
$ git commit -m"delete cc"
[master 4045e7a] delete cc
 1 file changed, 1 deletion(-)
 delete mode 100644 cc

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:55:18]
$ ll
total 24
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 11:32 aa
-rw-r--r--  1 zhangshaopo  staff     3B Jun  4 21:22 bb

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:55:21]
$ git status
On branch master
nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:55:25]
$ git log
commit 4045e7a1d96b9fb050a49ed06203ee343488c5b5 (HEAD -> master)
Author: apo 
Date:   Fri Jun 5 11:55:18 2020 +0800

    delete cc

commit 51e9dc3955215120a4094e18d6c691e76c6324de
Author: apo 
Date:   Thu Jun 4 22:00:09 2020 +0800

    combine add and 2

commit 38457f22dec999493e4bab764eedb785140c450d
Author: zhangshaopo 
Date:   Wed Jun 3 21:16:15 2020 +0800

    zhangshaopo add file

commit beab99bb7d4887a05e322483e65db7e569af2bce
Author: zhangshaopo 
Date:   Wed Jun 3 17:51:13 2020 +0800

    add README.md

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:55:26]
$ git rm aa
rm 'aa'

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:56:02]
$ git status
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    deleted:    aa


# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [11:56:04]
$ git commit -m"delete aa"
[master 48ee187] delete aa
 1 file changed, 1 deletion(-)
 delete mode 100644 aa

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:56:12]
$ git status
On branch master
nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:56:15]
$ ll
total 16
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     3B Jun  4 21:22 bb

27 | 开发中临时加塞了紧急任务怎么处理？

通过stash能够将工作目录中和暂存区的内容暂时保存；在添加了a和c文件，并且修改了bb文件，stash后不会保存新增的a和c，需要通过add a和c，再stash才会将其进行保存；恢复的时候，pop会删除 stash历史记录，apply不会

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:19:17]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   bb

Untracked files:
  (use "git add ..." to include in what will be committed)
    a
    c

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:19:19]
$ git stash
Saved working directory and index state WIP on master: 48ee187 delete aa

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:19:35]
$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)
    a
    c

nothing added to commit but untracked files present (use "git add" to track)

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:19:38]
$ git commit -am"a and c"
On branch master
Untracked files:
    a
    c

nothing added to commit but untracked files present

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:20:03] C:1
$ git commit -a -m"a and c"
On branch master
Untracked files:
    a
    c

nothing added to commit but untracked files present

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:20:14] C:1
$ git add a c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:20:28]
$ git commit -m"add a and c"
[master 2aea138] add a and c
 2 files changed, 2 insertions(+)
 create mode 100644 a
 create mode 100644 c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:20:39]
$ git status
On branch master
nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:20:41]
$ ll
total 32
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:19 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:20:43]
$ git stash pop
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   bb

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (c14399230601f0f07efc2a7e946cfa387d0ca427)

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:20:49]
$ ll
total 32
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 13:20 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:28:16]
$ vi d

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:28:32]
$ git status
On branch master
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   bb

Untracked files:
  (use "git add ..." to include in what will be committed)
    d

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

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:28:39]
$ git add d

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:30:55]
$ git stash
Saved working directory and index state WIP on master: 2aea138 add a and c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:31:09]
$ git status
On branch master
nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:31:14]
$ ll
total 32
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:31 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:31:37] C:129
$ git stash list
stash@{0}: WIP on master: 2aea138 add a and c

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [13:31:39]
$ git stash apply
On branch master
Changes to be committed:
  (use "git restore --staged ..." to unstage)
    new file:   d

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
    modified:   bb

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [13:31:45]
$ git stash list
stash@{0}: WIP on master: 2aea138 add a and c

28 | 如何指定不需要Git管理的文件？

通过创建.gitignore，没有 / 则能匹配所有文件和目录，以 / 结尾则匹配目录，*则代表匹配所有。
https://github.com/github/gitignore

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:57:48]
$ ll
total 48
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 13:31 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 14:43 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 14:43 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 14:45 f

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:57:50]
$ cat .gitignore
d
f

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:58:03]
$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)
    .gitignore
    e

nothing added to commit but untracked files present (use "git add" to track)

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:58:09]
$ vi .gitignore

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:58:38]
$ cat .gitignore
d/
f

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master x [14:58:43]
$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)
    .gitignore
    d
    e

nothing added to commit but untracked files present (use "git add" to track)

29 | 如何将Git仓库备份到本地？

1

2

3
  • 本地哑协议（下载）

--bare参数指定不需要clone代码文件，只需要.git文件内容。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:13:05]
$ git clone --bare /Users/zhangshaopo/git-learning-1/.git ya
Cloning into bare repository 'ya'...
done.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:13:12]
$ ll ya
total 32
-rw-r--r--    1 zhangshaopo  staff    23B Jun  5 17:13 HEAD
drwxr-xr-x    2 zhangshaopo  staff    64B Jun  5 17:13 branches
-rw-r--r--    1 zhangshaopo  staff   175B Jun  5 17:13 config
-rw-r--r--    1 zhangshaopo  staff    73B Jun  5 17:13 description
drwxr-xr-x   13 zhangshaopo  staff   416B Jun  5 17:13 hooks
drwxr-xr-x    3 zhangshaopo  staff    96B Jun  5 17:13 info
drwxr-xr-x  105 zhangshaopo  staff   3.3K Jun  5 17:13 objects
-rw-r--r--    1 zhangshaopo  staff   162B Jun  5 17:13 packed-refs
drwxr-xr-x    4 zhangshaopo  staff   128B Jun  5 17:13 refs

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:13:15]
$ git branch -av
fatal: not a git repository (or any of the parent directories): .git

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:13:23] C:128
$ ll
total 0
drwxr-xr-x  11 zhangshaopo  staff   352B Jun  5 17:13 ya

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:14:52]
$ cd ya

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/ya on git:master o [17:14:56]
$ git branch -av
* master 5dd4342 null-1
  temp   e5d61ab a

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/ya on git:master o [17:15:01]
$ cd ..

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:15:07]
$ ll
total 0
drwxr-xr-x  11 zhangshaopo  staff   352B Jun  5 17:13 ya

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:15:08]
$ rm -fr ya

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:15:11]
$ git clone  /Users/zhangshaopo/git-learning-1/.git ya
Cloning into 'ya'...
done.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:15:21]
$ ll ya
total 48
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 17:15 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 17:15 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 17:15 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 17:15 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 17:15 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 17:15 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 17:15 f
  • 智能协议（下载）
# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:26:35]
$ git clone  file:///Users/zhangshaopo/git-learning-1/ zhineng
Cloning into 'zhineng'...
remote: Enumerating objects: 48, done.
remote: Counting objects: 100% (48/48), done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 48 (delta 7), reused 0 (delta 0)
Receiving objects: 100% (48/48), done.
Resolving deltas: 100% (7/7), done.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo [17:27:08]
$ ll zhineng
total 48
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 17:27 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 17:27 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 17:27 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 17:27 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 17:27 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 17:27 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 17:27 f
  • push

在push之后，进入repo，通过git相关命令就能看见新建的分支以及文件了。

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [17:37:11]
$ git remote add zhineng file:///Users/zhangshaopo/local-repo/zhineng

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [17:37:46]
$ git branch -av
* master 5dd4342 null-1
  temp   e5d61ab a

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [17:38:26]
$ git checkout -b test1
Switched to a new branch 'test1'

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:02:55]
$ ll
total 48
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 13:31 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 14:43 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 14:43 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 14:45 f

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:02:59]
$ git branch -av
  master 5dd4342 null-1
  temp   e5d61ab a
* test1  5dd4342 null-1

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:03:06]
$ vi g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 x [19:03:18]
$ git status
On branch test1
Untracked files:
  (use "git add ..." to include in what will be committed)
    g

nothing added to commit but untracked files present (use "git add" to track)

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 x [19:03:29]
$ git add g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 x [19:03:41]
$ git commit -m"add g"
[test1 264eeb6] add g
 1 file changed, 1 insertion(+)
 create mode 100644 g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:03:53]
$ git push zhineng
fatal: The current branch test1 has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream zhineng test1


# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:04:05] C:128
$ git push --set-upstream zhineng test1
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 249 bytes | 249.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
To file:///Users/zhangshaopo/local-repo/zhineng
 * [new branch]      test1 -> test1
Branch 'test1' set up to track remote branch 'test1' from 'zhineng'.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:04:12]
$ git branch -av
  master                5dd4342 null-1
  temp                  e5d61ab a
* test1                 264eeb6 add g
  remotes/zhineng/test1 264eeb6 add g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [19:06:35]
$ git status
On branch test1
Your branch is up to date with 'zhineng/test1'.

nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/zhineng on git:test1 o [19:16:39]
$ pwd
/Users/zhangshaopo/local-repo/zhineng

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/zhineng on git:test1 o [19:15:05]
$ git checkout test1
Already on 'test1'

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/zhineng on git:test1 o [19:16:32]
$ ll
total 56
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 17:27 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 19:11 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 19:11 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 19:11 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 19:11 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 19:11 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 19:11 f
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 19:14 g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/local-repo/zhineng on git:test1 o [19:16:33]
$ git branch -av
  master                5dd4342 null-1
* test1                 264eeb6 add g
  remotes/origin/HEAD   -> origin/master
  remotes/origin/master 5dd4342 null-1
  remotes/origin/temp   e5d61ab a

30 | 注册一个GitHub账号

略

31 | 配置公私钥

在通过ssh进行仓库连接，需要使用密钥对，就可以不需要http/https那样需要用户名和密码了。

https://help.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh

32 | 在GitHub上创建个人仓库

1

33 | 把本地仓库同步到GitHub

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:27:48]
$ git remote add github [email protected]:ragpo/git-learning.git

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:35:54] C:129
$ git remote -v
github  [email protected]:ragpo/git-learning.git (fetch)
github  [email protected]:ragpo/git-learning.git (push)
zhineng file:///Users/zhangshaopo/local-repo/zhineng (fetch)
zhineng file:///Users/zhangshaopo/local-repo/zhineng (push)

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:35:56]
$ git branch -av
  master                5dd4342 null-1
  temp                  e5d61ab a
* test1                 264eeb6 add g
  remotes/zhineng/test1 264eeb6 add g

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:38:47] C:130
$ git push github
Enumerating objects: 32, done.
Counting objects: 100% (32/32), done.
Delta compression using up to 8 threads
Compressing objects: 100% (17/17), done.
Writing objects: 100% (32/32), 2.09 KiB | 713.00 KiB/s, done.
Total 32 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5), done.
remote:
remote: Create a pull request for 'test1' on GitHub by visiting:
remote:      https://github.com/ragpo/git-learning/pull/new/test1
remote:
To github.com:ragpo/git-learning.git
 * [new branch]      test1 -> test1

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:38:59]
$ git push github --all
Enumerating objects: 22, done.
Counting objects: 100% (22/22), done.
Delta compression using up to 8 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (21/21), 1.72 KiB | 883.00 KiB/s, done.
Total 21 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), done.
remote:
remote: Create a pull request for 'temp' on GitHub by visiting:
remote:      https://github.com/ragpo/git-learning/pull/new/temp
remote:
To github.com:ragpo/git-learning.git
 * [new branch]      temp -> temp
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to '[email protected]:ragpo/git-learning.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:test1 o [11:59:04]
$ git checkout master
Switched to branch 'master'

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:59:13]
$ git status
On branch master
nothing to commit, working tree clean

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [11:59:20]
$ git merge github/master
fatal: refusing to merge unrelated histories

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [12:06:21] C:129
$ git merge github/master --allow-unrelated-histories
Merge made by the 'recursive' strategy.
 LICENSE | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 LICENSE

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [12:06:29]
$ ll
total 72
-rw-r--r--  1 zhangshaopo  staff    11K Jun  6 12:06 LICENSE
-rw-r--r--  1 zhangshaopo  staff     6B Jun  3 17:50 README.md
-rw-r--r--  1 zhangshaopo  staff     2B Jun  5 13:17 a
-rw-r--r--  1 zhangshaopo  staff     9B Jun  5 13:31 bb
-rw-r--r--  1 zhangshaopo  staff     3B Jun  5 13:17 c
-rw-r--r--  1 zhangshaopo  staff     6B Jun  5 14:43 d
-rw-r--r--  1 zhangshaopo  staff     5B Jun  5 14:43 e
drwxr-xr-x  3 zhangshaopo  staff    96B Jun  5 14:45 f

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [12:17:26]
$ git log --graph
*   commit 49f2b29637df38aa5ef027cf4222c538216b0d80 (HEAD -> master)
|\  Merge: 5dd4342 8a87c0f
| | Author: apo 
| | Date:   Sat Jun 6 12:06:26 2020 +0800
| |
| |     Merge remote-tracking branch 'github/master'
| |
| * commit 8a87c0f9df7af760d2d4e4a090947d6fa77e86d9 (github/master)
|   Author: ragpo <[email protected]>
|   Date:   Sat Jun 6 00:25:01 2020 +0800
|
|       Initial commit
|
* commit 5dd43425e001faaf107c9d6408539e642089708e
| Author: apo 
| Date:   Fri Jun 5 17:12:47 2020 +0800
|
|     null-1
|

# zhangshaopo @ zhangshaopodeMacBook-Pro in ~/git-learning-1 on git:master o [12:17:34]
$ git push github --all
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 297 bytes | 297.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:ragpo/git-learning.git
   8a87c0f..49f2b29  master -> master

$ git log --graph
*   commit 49f2b29637df38aa5ef027cf4222c538216b0d80 (HEAD -> master, github/master)
|\  Merge: 5dd4342 8a87c0f
| | Author: apo 
| | Date:   Sat Jun 6 12:06:26 2020 +0800
| |
| |     Merge remote-tracking branch 'github/master'
| |
| * commit 8a87c0f9df7af760d2d4e4a090947d6fa77e86d9
|   Author: ragpo <[email protected]>
|   Date:   Sat Jun 6 00:25:01 2020 +0800
|
|       Initial commit
|
* commit 5dd43425e001faaf107c9d6408539e642089708e
| Author: apo 
| Date:   Fri Jun 5 17:12:47 2020 +0800
|
|     null-1
1

2

34 | 不同人修改了不同文件如何处理？

我们在别人修改并且push之前，已经pull/fetch到本地后，别人在修改了一个文件A，push到GitHub，此时我们在本地修改文件B，在push的时候会报错，那么就需要通过使用git fetch，然后再git merge，最后git push。git pull其实等于git fetch和git merge两个操作，完成本地与远端的同步，如果相同文件

35 | 不同人修改了同文件的不同区域如何处理？

这个其实和上个没有太大区别，因为修改的地方不一样，所以会在merge的时候自动合并。

36 | 不同人修改了同文件的同一区域如何处理？

首先还是得先pull在GitHub上最新的代码，然后会提示merge失败的地方，修改对应的文件，然后再add commit，然后push。

37 | 同时变更了文件名和文件内容如何处理？

在别人修改了文件名以及内容，并且push到GitHub后，我们在本地修改了原始文件，push的时候会报错，通过使用git pull就能将文件名同步并且merge文件内容。

38 | 把同一文件改成了不同的文件名如何处理？

同理，先git pull下来，然后会提示文件冲突，本地会出现别人修改后的文件名文件，再通过git status根据提示add和rm文件，最后push。

39 | 禁止向集成分支执行push -f操作

悠着点用。GitHub和gitlab提供禁止push -f的操作配置。

40 | 禁止向集成分支执行变更历史的操作

改了之后其他人会很麻烦，

41 | GitHub为什么会火？

1

2

3

4

5

42 | GitHub都有哪些核心功能？

https://github.com/
https://github.com/features

43 | 怎么快速淘到感兴趣的开源项目?

可以通过输入关键字匹配。
https://github.com/xirong/my-git

1

44 | 怎样在GitHub上搭建个人博客

https://github.com/barryclark/jekyll-now

45 | 开源项目怎么保证代码质量？

46 | 为何需要组织类型的仓库？

47 | 创建团队的项目

48 | 怎样选择适合自己团队的工作流？

1

2

3

4

5

6

7

49 | 如何挑选合适的分支集成策略？

将Beijing的分支merge到master，以下是默认的分支结构。并有以下三种分支集成策略。

1
2
  1. create a merge commit: Beijing的分支会连接到master那里。
2
  1. squash and merge: 将北京的合并到master，会将三个commit合并成一个merge到master上，master会多了一个commit，北京本身没有变化。
3
  1. rebase and merge: 将北京的三个commit合并到master上，北京本身没有变化。
4

50 | 启用issue跟踪需求和任务

提issue，然后还可以配置issue模板。

51 | 如何用project管理issue？

其实就是看板功能

52 | 项目内部怎么实施code review？

53 | 团队协作时如何做多分支的集成？

54 | 怎样保证集成的质量？

55 | 怎样把产品包发布到GitHub上？

releases

56 | 怎么给项目增加详细的指导文档？

wiki

57 | 国内互联网企业为什么喜欢GitLab？

略略略

58 | GitLab有哪些核心的功能？

略略略

59 | GitLab上怎么做项目管理？

略略略

60 | GitLab上怎么做code review？

略略略

61 | GitLab上怎么保证集成的质量？

略略略

62 | 怎么把应用部署到AWS上？

略略略

补充

直接在全局设置
git config --global http.sslVerify "false"
当然是一个方法，但此方法的不足在于会玷污全局配置。下面介绍一个即方便又不玷污全局配置的方法。

推荐的方法
Windows
打开 PowerShell

$Env:GIT_SSL_NO_VERIFY="true"
git clone https://abc.dev/user/repo.git
然后 cd 进去

cd .\repo\
设置不验证证书

git config http.sslVerify "false"
Linux
打开终端

export GIT_SSL_NO_VERIFY="true"
git clone https://abc.dev/user/repo.git
然后 cd 进去

cd ./repo/
设置不验证证书

git config http.sslVerify "false"

你可能感兴趣的:(极客时间 Git 学习笔记)

  • 关于沟通这件事，项目经理不需要每次都面对面进行 流程大师兄
    很多项目经理都会遇到这样的问题，项目中由于事情太多，根本没有足够的时间去召开会议，那在这种情况下如何去有效地管理项目中的利益相关者？当然，不建议电子邮件也不需要开会的话，建议可以采取下面几种方式来形成有效的沟通，这几种方式可以帮助你努力的通过各种办法来保持和各方面的联系。项目经理首先要问自己几个问题，项目中哪些利益相关者是必须要进行沟通的？可以列出项目中所有的利益相关者清单，同时也整理出项目中哪些
  • LocalDateTime 转 String igotyback java开发语言
    importjava.time.LocalDateTime;importjava.time.format.DateTimeFormatter;publicclassMain{publicstaticvoidmain(String[]args){//获取当前时间LocalDateTimenow=LocalDateTime.now();//定义日期格式化器DateTimeFormatterformat
  • 如何在 Fork 的 GitHub 项目中保留自己的修改并同步上游更新？github_fork_update iBaoxing github
    如何在Fork的GitHub项目中保留自己的修改并同步上游更新？在GitHub上Fork了一个项目后，你可能会对项目进行一些修改，同时原作者也在不断更新。如果想要在保留自己修改的基础上，同步原作者的最新更新，很多人会不知所措。本文将详细讲解如何在不丢失自己改动的情况下，将上游仓库的更新合并到自己的仓库中。问题描述假设你在GitHub上Fork了一个项目，并基于该项目做了一些修改，随后你发现原作者对
  • 扫地机类清洁产品之直流无刷电机控制 悟空胆好小 清洁服务机器人单片机人工智能
    扫地机类清洁产品之直流无刷电机控制1.1前言扫地机产品有很多的电机控制，滚刷电机1个，边刷电机1-2个，清水泵电机，风机一个，部分中高端产品支持抹布功能，也就是存在抹布盘电机，还有追觅科沃斯石头等边刷抬升电机，滚刷抬升电机等的，这些电机有直流有刷电机，直接无刷电机，步进电机，电磁阀，挪动泵等不同类型。电机的原理，驱动控制方式也不行。接下来一段时间的几个文章会作个专题分析分享。直流有刷电机会自动持续
  • 【一起学Rust | 设计模式】习惯语法——使用借用类型作为参数、格式化拼接字符串、构造函数 广龙宇 一起学Rust#Rust设计模式rust设计模式开发语言
    提示：文章写完后，目录可以自动生成，如何生成可参考右边的帮助文档文章目录前言一、使用借用类型作为参数二、格式化拼接字符串三、使用构造函数总结前言Rust不是传统的面向对象编程语言，它的所有特性，使其独一无二。因此，学习特定于Rust的设计模式是必要的。本系列文章为作者学习《Rust设计模式》的学习笔记以及自己的见解。因此，本系列文章的结构也与此书的结构相同（后续可能会调成结构），基本上分为三个部分
  • git常用命令笔记 咩酱-小羊 git笔记
    ###用习惯了idea总是不记得git的一些常见命令，需要用到的时候总是担心旁边站了人~~~记个笔记@_@，告诉自己看笔记不丢人初始化初始化一个新的Git仓库gitinit配置配置用户信息gitconfig--globaluser.name"YourName"gitconfig--globaluser.email"[email protected]"基本操作克隆远程仓库gitclone查看
  • linux中sdl的使用教程,sdl使用入门 Melissa Corvinus linux中sdl的使用教程
    本文通过一个简单示例讲解SDL的基本使用流程。示例中展示一个窗口，窗口里面有个随机颜色快随机移动。当我们鼠标点击关闭按钮时间窗口关闭。基本步骤如下：1.初始化SDL并创建一个窗口。SDL_Init()初始化SDL_CreateWindow()创建窗口2.纹理渲染存储RGB和存储纹理的区别：比如一个从左到右由红色渐变到蓝色的矩形，用存储RGB的话就需要把矩形中每个点的具体颜色值存储下来；而纹理只是一
  • LLM 词汇表 落难Coder LLMsNLP大语言模型大模型llama人工智能
    Contextwindow“上下文窗口”是指语言模型在生成新文本时能够回溯和参考的文本量。这不同于语言模型训练时所使用的大量数据集，而是代表了模型的“工作记忆”。较大的上下文窗口可以让模型理解和响应更复杂和更长的提示，而较小的上下文窗口可能会限制模型处理较长提示或在长时间对话中保持连贯性的能力。Fine-tuning微调是使用额外的数据进一步训练预训练语言模型的过程。这使得模型开始表示和模仿微调数
  • 下载github patch到本地 小米人er 我的博客gitpatch
    以下是几种从GitHub上下载以.patch结尾的补丁文件的方法：通过浏览器直接下载打开包含该.patch文件的GitHub仓库。在仓库的文件列表中找到对应的.patch文件。点击该文件，浏览器会显示文件的内容，在页面的右上角通常会有一个“Raw”按钮，点击它可以获取原始文件内容。然后在浏览器中使用快捷键（如Ctrl+S或者Command+S）将原始文件保存到本地，选择保存的文件名并确保后缀为.p
  • 509. 斐波那契数(每日一题) lzyprime
    lzyprime博客(github)创建时间：2021.01.04qq及邮箱：2383518170leetcode笔记题目描述斐波那契数，通常用F(n)表示，形成的序列称为斐波那契数列。该数列由0和1开始，后面的每一项数字都是前面两项数字的和。也就是：F(0)=0，F(1)=1F(n)=F(n-1)+F(n-2)，其中n>1给你n，请计算F(n)。示例1：输入：2输出：1解释：F(2)=F(1)+
  • 关于提高复杂业务逻辑代码可读性的思考 编程经验分享 开发经验java数据库开发语言
    目录前言需求场景常规写法拆分方法领域对象总结前言实际工作中大部分时间都是在写业务逻辑，一般都是三层架构，表示层（Controller）接收客户端请求，并对入参做检验，业务逻辑层（Service）负责处理业务逻辑，一般开发都是在这一层中写具体的业务逻辑。数据访问层（Dao）是直接和数据库交互的，用于查数据给业务逻辑层，或者是将业务逻辑层处理后的数据写入数据库。简单的增删改查接口不用多说，基本上写好一
  • 18-115 一切思考不能有效转化为行动，都TM是扯淡！ 成长时间线
    7月25号写了一篇关于为什么会断更如此严重的反思，然而，之后日更仅仅维持了一周，又出现了这次更严重的现象。从8月2号到昨天8月6号，5天！又是5天没有更文！虽然这次断更时间和上次一样，那为什么说这次更严重？因为上次之后就分析了问题的原因，以及应该如何解决，按理说应该会好转，然而，没过几天严重断更的现象再次出现，想想，经过反思，问题依然没有解决与改变，这让我有些担忧。到底是哪里出了问题，难道我就真的
  • 郎朗大婚娶公主：所有光环的背后，都是十年如一日的自律 简小尘
    近日，关于郎朗大婚的新闻上了热搜，看了新娘的照片，既有天使般的面容，更有魔鬼般的身材，关键是人家还身世好，又有才华，这真的是让所有男人羡慕嫉妒恨哪。有些人不禁会想，“凭什么郎朗的人生就象开挂了一样，可我却每天都活得这么狼狈！”其实，每个开挂的人生背后，都是苦行僧般的自律。01欲戴王冠，必承其重。练琴不能只靠兴趣，更需要自律！我们先来看一下朗朗在小时候的作息时间表：早晨5:45起床，练琴1小时。中午
  • 四章-32-点要素的聚合 彩云飘过
    本文基于腾讯课堂老胡的课《跟我学Openlayers--基础实例详解》做的学习笔记，使用的openlayers5.3.xapi。源码见1032.html，对应的官网示例https://openlayers.org/en/latest/examples/cluster.htmlhttps://openlayers.org/en/latest/examples/earthquake-clusters.
  • Git常用命令－修改远程仓库地址 猿大师 LinuxJavagitjava
    查看远程仓库地址gitremote-v返回结果originhttps://git.coding.net/＊＊＊＊＊.git(fetch)originhttps://git.coding.net/＊＊＊＊＊.git(push)修改远程仓库地址gitremoteset-urloriginhttps://git.coding.net/＊＊＊＊＊.git先删除后增加远程仓库地址gitremotermori
  • 【华为OD机试真题2023B卷 JAVA&JS】We Are A Team 若博豆 java算法华为javascript
    华为OD2023（B卷）机试题库全覆盖，刷题指南点这里WeAreATeam时间限制：1秒|内存限制：32768K|语言限制：不限题目描述：总共有n个人在机房，每个人有一个标号（1<=标号<=n），他们分成了多个团队，需要你根据收到的m条消息判定指定的两个人是否在一个团队中，具体的：1、消息构成为：abc，整数a、b分别代
  • 少了生活气息 我爱大草莓
    最近啊，总觉得自己日更的内容缺了点什么。我仔细地想，大概是少了些生活气息。这两三个月减少了许多与别人相处的时间，独自生活，偶尔只是出去买菜，总觉得生活好像变空了许多。买菜的时候会跟档口的阿姨聊一两句话，让自己感觉在真实地生活着。幸好我也不是一宅到底，偶尔周末也会约着跟好朋友见面，面对面交流跟隔着屏幕交流，效果还是不一样的，至少有更为真实的生活感。写作不仅需要有阅读量，有文笔，生活阅历也是非常重要的
  • 398顺境，逆境 戴骁勇
    2018.11.27周二雾霾最近儿子进入了一段顺境期，今天表现尤其不错。今天的数学测试成绩喜人，没有出现以往的计算错误，整个卷面书写工整，附加题也在规定时间内完成且做对。为迎接体育测试的锻炼有了质的飞跃。坐位体前屈成绩突飞猛进，估测成绩能达到12cm，这和上次测试的零分来比，简直是逆袭。儿子还在不断锻炼和提升，唯恐到时候掉链子。跑步姿势在我的调教下，逐渐正规起来，速度随之也有了提升。今晚测试的50
  • 从0到500+，我是如何利用自媒体赚钱？ 一列脚印
    运营公众号半个多月，从零基础的小白到现在慢慢懂了一些运营的知识。做好公众号是很不容易的，要做很多事情；排版、码字、引流…通通需要自己解决，业余时间全都花费在这上面涨这么多粉丝是真的不容易，对比知乎大佬来说，我们这种没资源，没人脉，还没钱的小透明来说，想要一个月涨粉上万，怕是今天没睡醒（不过你有的方法，算我piapia打脸）至少我是清醒的，自己慢慢努力，实现我的万粉目标！大家快来围观、支持我吧！孩子
  • 想明白这个问题，你才能写下去 文自拾
    春节放假的时候，又有一天梦见她，第二天她冒着漫天大雪，傻傻地跑来见我。她说，见见傻傻的我，天很冷，心很暖。她回去后，我写了一篇文章，题目叫——从此梦中只有你。我们没在一起的很长一段时间里，她都在我的心底，一次次出现在我的梦里。我对她说，在一起之前，是胆小且闷骚，在一起之后，我变得不要脸了。不要脸的——去爱你。那文章没写完，火车上，给她看了。我有点小失望，花了好几个小时写，她分分钟就看完，很希望她逐
  • GitHub上克隆项目 bigbig猩猩 github
    从GitHub上克隆项目是一个简单且直接的过程，它允许你将远程仓库中的项目复制到你的本地计算机上，以便进行进一步的开发、测试或学习。以下是一个详细的步骤指南，帮助你从GitHub上克隆项目。一、准备工作1.安装Git在克隆GitHub项目之前，你需要在你的计算机上安装Git工具。Git是一个开源的分布式版本控制系统，用于跟踪和管理代码变更。你可以从Git的官方网站（https://git-scm.
  • git - Webhook让部署自动化 大猪大猪
    我们现在有一个需求，将项目打包上传到gitlab或者github后，程序能自动部署，不用手动地去服务器中进行项目更新并运行，如何做到？这里我们可以使用gitlab与github的挂钩，挂钩的原理就是，每当我们有请求到gitlab与github服务器时，这时他俩会根据我们配置的挂钩地扯进行访问，webhook挂钩程序会一直监听着某个端口请求，一但收到他们发过来的请求，这时就知道用户有请求提交了，这时
  • 【JS】执行时长(100分) |思路参考+代码解析（C++） l939035548 JS算法数据结构c++
    题目为了充分发挥GPU算力，需要尽可能多的将任务交给GPU执行，现在有一个任务数组，数组元素表示在这1秒内新增的任务个数且每秒都有新增任务。假设GPU最多一次执行n个任务，一次执行耗时1秒，在保证GPU不空闲情况下，最少需要多长时间执行完成。题目输入第一个参数为GPU一次最多执行的任务个数，取值范围[1,10000]第二个参数为任务数组长度，取值范围[1,10000]第三个参数为任务数组，数字范围
  • MongoDB Oplog 窗口 喝醉酒的小白 MongoDB运维
    在MongoDB中，oplog（操作日志）是一个特殊的日志系统，用于记录对数据库的所有写操作。oplog允许副本集成员（通常是从节点）应用主节点上已经执行的操作，从而保持数据的一致性。它是MongoDB副本集实现数据复制的基础。MongoDBOplog窗口oplog窗口是指在MongoDB副本集中，从节点可以用来同步数据的时间范围。这个窗口通常由以下因素决定：Oplog大小：oplog的大小是有限
  • libyuv之linux编译 jaronho Linuxlinux运维服务器
    文章目录一、下载源码二、编译源码三、注意事项1、银河麒麟系统（aarch64）（1）解决armv8-a+dotprod+i8mm指令集支持问题（2）解决armv9-a+sve2指令集支持问题一、下载源码到GitHub网站下载https://github.com/lemenkov/libyuv源码，或者用直接用git克隆到本地，如：gitclonehttps://github.com/lemenko
  • Faiss Tips：高效向量搜索与聚类的利器 焦习娜Samantha
    FaissTips：高效向量搜索与聚类的利器faiss_tipsSomeusefultipsforfaiss项目地址:https://gitcode.com/gh_mirrors/fa/faiss_tips项目介绍Faiss是由FacebookAIResearch开发的一个用于高效相似性搜索和密集向量聚类的库。它支持多种硬件平台，包括CPU和GPU，能够在海量数据集上实现快速的近似最近邻搜索（AN
  • 百善孝为先 杜友顺
    2018年11月29日天气~晴星期四找点空闲找点时间领着孩子常回家看看带上笑容带上祝福陪同爱人常回家看看家，永远是儿女们幸福温暖的港湾，那里有我们日夜思念的父母，有着彼此的牵挂，无论走到哪里，家永远是避风雨的港湾。今天没事，和媳妇回了趟老家，看看父母，回到家，房间里不算凌乱，可是细心的我发现有的地方已经沾满了灰尘，桌子上父亲不离手的烟灰缸也弹满了烟灰。几个马上就要腐烂掉的水果蔫耷的搭拉着脑袋躺在了
  • pyecharts——绘制柱形图折线图 2224070247 信息可视化pythonjava数据可视化
    一、pyecharts概述自2013年6月百度EFE(ExcellentFrontEnd）数据可视化团队研发的ECharts1.0发布到GitHub网站以来，ECharts一直备受业界权威的关注并获得广泛好评，成为目前成熟且流行的数据可视化图表工具，被应用到诸多数据可视化的开发领域。Python作为数据分析领域最受欢迎的语言，也加入ECharts的使用行列，并研发出方便Python开发者使用的数据
  • node.js学习 小猿L node.jsnode.js学习vim
    node.js学习实操及笔记温故node.js，node.js学习实操过程及笔记~node.js学习视频node.js官网node.js中文网实操笔记githubcsdn笔记为什么学node.js可以让别人访问我们编写的网页为后续的框架学习打下基础，三大框架vuereactangular离不开node.jsnode.js是什么官网：node.js是一个开源的、跨平台的运行JavaScript的运行
  • 阶段总结反思 轻争
    马上就要进入10月份了，今天做一下前段时间的总结和反思。前段时间，日更、英语、健身、护肤坚持的比较好。阅读、书法坚持的不好。1.中间被迫停更半个多月，其余时间一直在坚持日更挑战。偶尔也有不想写的时候，就做一下摘抄。因为阅读（输入）没跟上来，所以写作（输出）质量有待进一步加强。2.英语做到了一周至少学习5天，每次不少于30分钟，但是小班课没有跟上更新速度，下一步要争取利用零碎时间补听小班课。3.减肥
  • web前段跨域nginx代理配置 刘正强 nginxcmsWeb
    nginx代理配置可参考server部分 server {         listen       80;         server_name  localhost;
  • spring学习笔记 caoyong spring
    一、概述     a>、核心技术 : IOC与AOP b>、开发为什么需要面向接口而不是实现     接口降低一个组件与整个系统的藕合程度，当该组件不满足系统需求时，可以很容易的将该组件从系统中替换掉，而不会对整个系统产生大的影响 c>、面向接口编口编程的难点在于如何对接口进行初始化,(使用工厂设计模式)
  • Eclipse打开workspace提示工作空间不可用 0624chenhong eclipse
    做项目的时候，难免会用到整个团队的代码，或者上一任同事创建的workspace， 1.电脑切换账号后，Eclipse打开时，会提示Eclipse对应的目录锁定，无法访问，根据提示，找到对应目录，G:\eclipse\configuration\org.eclipse.osgi\.manager，其中文件.fileTableLock提示被锁定。 解决办法，删掉.fileTableLock文件，重
  • Javascript 面向对面写法的必要性？ 一炮送你回车库 JavaScript
    现在Javascript面向对象的方式来写页面很流行，什么纯javascript的mvc框架都出来了：ember 这是javascript层的mvc框架哦,不是j2ee的mvc框架   我想说的是，javascript本来就不是一门面向对象的语言，用它写出来的面向对象的程序，本身就有些别扭，很多人提到js的面向对象首先提的是：复用性。那么我请问你写的js里有多少是可以复用的，用fu
  • js array对象的迭代方法 换个号韩国红果果 array
    1.forEach 该方法接受一个函数作为参数， 对数组中的每个元素 使用该函数  return 语句失效 function square(num) { print(num, num * num); } var nums = [1,2,3,4,5,6,7,8,9,10]; nums.forEach(square); 2.every 该方法接受一个返回值为布尔类型
  • 对Hibernate缓存机制的理解 归来朝歌 session一级缓存对象持久化
    在hibernate中session一级缓存机制中，有这么一种情况： 问题描述：我需要new一个对象，对它的几个字段赋值，但是有一些属性并没有进行赋值，然后调用 session.save()方法，在提交事务后，会出现这样的情况： 1：在数据库中有默认属性的字段的值为空 2：既然是持久化对象，为什么在最后对象拿不到默认属性的值？ 通过调试后解决方案如下： 对于问题一，如你在数据库里设置了
  • WebService调用错误合集 darkranger webservice
     Java.Lang.NoClassDefFoundError: Org/Apache/Commons/Discovery/Tools/DiscoverSingleton 调用接口出错， 一个简单的WebService import org.apache.axis.client.Call;import org.apache.axis.client.Service; 首先必不可
  • JSP和Servlet的中文乱码处理 aijuans Java Web
    JSP和Servlet的中文乱码处理 前几天学习了JSP和Servlet中有关中文乱码的一些问题，写成了博客，今天进行更新一下。应该是可以解决日常的乱码问题了。现在作以下总结希望对需要的人有所帮助。我也是刚学，所以有不足之处希望谅解。 一、表单提交时出现乱码： 在进行表单提交的时候，经常提交一些中文，自然就避免不了出现中文乱码的情况，对于表单来说有两种提交方式：get和post提交方式。所以
  • 面试经典六问 atongyeye 工作面试
    题记：因为我不善沟通，所以在面试中经常碰壁，看了网上太多面试宝典，基本上不太靠谱。只好自己总结，并试着根据最近工作情况完成个人答案。以备不时之需。 以下是人事了解应聘者情况的最典型的六个问题： 1 简单自我介绍 关于这个问题，主要为了弄清两件事，一是了解应聘者的背景，二是应聘者将这些背景信息组织成合适语言的能力。 我的回答：(针对技术面试回答，如果是人事面试，可以就掌
  • contentResolver.query()参数详解 百合不是茶 androidquery()详解
    收藏csdn的博客,介绍的比较详细,新手值得一看 1.获取联系人姓名 一个简单的例子，这个函数获取设备上所有的联系人ID和联系人NAME。 [java]  view plain copy   public void fetchAllContacts() {      
  • ora-00054:resource busy and acquire with nowait specified解决方法 bijian1013 oracle数据库killnowait
            当某个数据库用户在数据库中插入、更新、删除一个表的数据，或者增加一个表的主键时或者表的索引时，常常会出现ora-00054:resource busy and acquire with nowait specified这样的错误。主要是因为有事务正在执行（或者事务已经被锁），所有导致执行不成功。 1.下面的语句
  • web 开发乱码 征客丶 springWeb
    以下前端都是 utf-8 字符集编码 一、后台接收 1.1、 get 请求乱码 get 请求中，请求参数在请求头中； 乱码解决方法： a、通过在web 服务器中配置编码格式：tomcat 中，在 Connector 中添加URIEncoding="UTF-8"； 1.2、post 请求乱码 post 请求中，请求参数分两部份， 1.2.1、url？参数，
  • 【Spark十六】： Spark SQL第二部分数据源和注册表的几种方式 bit1129 spark
    Spark SQL数据源和表的Schema case class apply schema parquet json JSON数据源 准备源数据 {"name":"Jack", "age": 12, "addr":{"city":"beijing&
  • JVM学习之:调优总结 -Xms -Xmx -Xmn -Xss BlueSkator -Xss-Xmn-Xms-Xmx
      堆大小设置JVM 中最大堆大小有三方面限制：相关操作系统的数据模型（32-bt还是64-bit）限制；系统的可用虚拟内存限制；系统的可用物理内存限制。32位系统下，一般限制在1.5G~2G；64为操作系统对内存无限制。我在Windows Server 2003 系统，3.5G物理内存，JDK5.0下测试，最大可设置为1478m。典型设置： java -Xmx355
  • jqGrid 各种参数 详解(转帖) BreakingBad jqGrid
      jqGrid 各种参数 详解 分类：  源代码分享  个人随笔请勿参考  解决开发问题 2012-05-09 20:29   84282人阅读   评论(22)   收藏   举报 jquery 服务器 parameters function ajax string  
  • 读《研磨设计模式》-代码笔记-代理模式-Proxy bylijinnan java设计模式
    声明： 本文只为方便我个人查阅和理解，详细的分析以及源代码请移步 原作者的博客http://chjavach.iteye.com/ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; /* * 下面
  • 应用升级iOS8中遇到的一些问题 chenhbc ios8升级iOS8
    1、很奇怪的问题，登录界面，有一个判断，如果不存在某个值，则跳转到设置界面，ios8之前的系统都可以正常跳转，iOS8中代码已经执行到下一个界面了，但界面并没有跳转过去，而且这个值如果设置过的话，也是可以正常跳转过去的，这个问题纠结了两天多，之前的判断我是在 -(void)viewWillAppear:(BOOL)animated  中写的，最终的解决办法是把判断写在 -(void
  • 工作流与自组织的关系？ comsci 设计模式工作
      目前的工作流系统中的节点及其相互之间的连接是事先根据管理的实际需要而绘制好的，这种固定的模式在实际的运用中会受到很多限制，特别是节点之间的依存关系是固定的，节点的处理不考虑到流程整体的运行情况，细节和整体间的关系是脱节的，那么我们提出一个新的观点，一个流程是否可以通过节点的自组织运动来自动生成呢？这种流程有什么实际意义呢？   这里有篇论文，摘要是：“针对网格中的服务
  • Oracle11.2新特性之INSERT提示IGNORE_ROW_ON_DUPKEY_INDEX daizj oracle
    insert提示IGNORE_ROW_ON_DUPKEY_INDEX 转自：http://space.itpub.net/18922393/viewspace-752123 在 insert into tablea ...select * from tableb中，如果存在唯一约束，会导致整个insert操作失败。使用IGNORE_ROW_ON_DUPKEY_INDEX提示，会忽略唯一
  • 二叉树:堆 dieslrae 二叉树
        这里说的堆其实是一个完全二叉树,每个节点都不小于自己的子节点,不要跟jvm的堆搞混了.由于是完全二叉树,可以用数组来构建.用数组构建树的规则很简单:     一个节点的父节点下标为: (当前下标 - 1)/2     一个节点的左节点下标为: 当前下标 * 2 + 1   &
  • C语言学习八结构体 dcj3sjt126com c
    为什么需要结构体，看代码 # include <stdio.h> struct Student //定义一个学生类型，里面有age, score, sex, 然后可以定义这个类型的变量 { int age; float score; char sex; } int main(void) { struct Student st = {80, 66.6,
  • centos安装golang dcj3sjt126com centos
    #在国内镜像下载二进制包 wget -c  http://www.golangtc.com/static/go/go1.4.1.linux-amd64.tar.gz tar -C /usr/local -xzf go1.4.1.linux-amd64.tar.gz   #把golang的bin目录加入全局环境变量 cat >>/etc/profile<
  • 10.性能优化-监控-MySQL慢查询 frank1234 性能优化MySQL慢查询
    1.记录慢查询配置 show variables where variable_name like 'slow%' ; --查看默认日志路径 查询结果：--不用的机器可能不同 slow_query_log_file=/var/lib/mysql/centos-slow.log 修改mysqld配置文件：/usr /my.cnf[一般在/etc/my.cnf，本机在/user/my.cn
  • Java父类取得子类类名 happyqing javathis父类子类类名
      在继承关系中，不管父类还是子类，这些类里面的this都代表了最终new出来的那个类的实例对象，所以在父类中你可以用this获取到子类的信息！   package com.urthinker.module.test; import org.junit.Test; abstract class BaseDao<T> { public void
  • Spring3.2新注解@ControllerAdvice jinnianshilongnian @Controller
    @ControllerAdvice，是spring3.2提供的新注解，从名字上可以看出大体意思是控制器增强。让我们先看看@ControllerAdvice的实现：   @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented @Component public @interface Co
  • Java spring mvc多数据源配置 liuxihope spring
    转自：http://www.itpub.net/thread-1906608-1-1.html 1、首先配置两个数据库 <bean id="dataSourceA" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close&quo
  • 第12章 Ajax（下） onestopweb Ajax
    index.html <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/
  • BW / Universe Mappings blueoxygen BO
      BW Element OLAP Universe Element Cube  Dimension Class Charateristic A class with dimension and detail objects (Detail objects for key and desription) Hi
  • Java开发熟手该当心的11个错误 tomcat_oracle java多线程工作单元测试
    #1、不在属性文件或XML文件中外化配置属性。比如，没有把批处理使用的线程数设置成可在属性文件中配置。你的批处理程序无论在DEV环境中，还是UAT（用户验收 测试）环境中，都可以顺畅无阻地运行，但是一旦部署在PROD 上，把它作为多线程程序处理更大的数据集时，就会抛出IOException，原因可能是JDBC驱动版本不同，也可能是#2中讨论的问题。如果线程数目 可以在属性文件中配置，那么使它成为
  • 推行国产操作系统的优劣 yananay windowslinux国产操作系统
    最近刮起了一股风，就是去“国外货”。从应用程序开始，到基础的系统，数据库，现在已经刮到操作系统了。原因就是“棱镜计划”，使我们终于认识到了国外货的危害，开始重视起了信息安全。操作系统是计算机的灵魂。既然是灵魂，为了信息安全，那我们就自然要使用和推行国货。可是，一味地推行，是否就一定正确呢？ 先说说信息安全。其实从很早以来大家就在讨论信息安全。很多年以前，就据传某世界级的网络设备制造商生产的交
按字母分类： ABCDEFGHIJKLMNOPQRSTUVWXYZ其他