image.png

    1. ##################### 仓库初始化 ####################
    2. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo
    3. $ git init
    4. Initialized empty Git repository in G:/git-repo/.git/
    8. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    9. $ ll
    10. total 12
    11. drwxr-xr-x 1 47345 197609 0 Jun 29 16:53 ./
    12. drwxr-xr-x 1 47345 197609 0 Jun 29 16:52 ../
    13. drwxr-xr-x 1 47345 197609 0 Jun 29 16:53 .git/
    16. ##################### 创建一个a.txt文件 ####################
    17. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    18. $ touch a.txt
    21. ##################### 查看文件修改的状态 ####################
    22. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    23. $ git status
    24. On branch master
    26. No commits yet
    28. Untracked files:
    29.   (use "git add <file>..." to include in what will be committed)
    30.         a.txt
    32. nothing added to commit but untracked files present (use "git add" to track)
    35. ##################### 将目录下所有文件加入暂存区 ####################
    36. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    37. $ git add .
    40. ##################### 再次查看文件修改的状态 ####################
    41. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    42. $ git status
    43. On branch master
    45. No commits yet
    47. Changes to be committed:
    48.   (use "git rm --cached <file>..." to unstage)
    49.         new file:   a.txt
    52. ##################### 提交暂存区到本地仓库 ####################
    53. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    54. $ git commit -m 'adding a.txt to repo'
    55. [master (root-commit) 8b094a6] adding a.txt to repo
    56.  1 file changed, 0 insertions(+), 0 deletions(-)
    57.  create mode 100644 a.txt
    59. ##################### 对a文件写入些内容 ####################
    60. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    61. $ vim a.txt
    63. ##################### 再次查看文件修改状态 ####################
    64. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    65. $ git status
    66. On branch master
    67. Changes not staged for commit:
    68.   (use "git add <file>..." to update what will be committed)
    69.   (use "git restore <file>..." to discard changes in working directory)
    70.         modified:   a.txt
    72. no changes added to commit (use "git add" and/or "git commit -a")
    75. ##################### 把修改后的文件添加到暂存区 ####################
    76. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    77. $ git add .
    78. warning: LF will be replaced by CRLF in a.txt.
    79. The file will have its original line endings in your working directory
    81. ##################### 再次查看状态 ####################
    82. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    83. $ git status
    84. On branch master
    85. Changes to be committed:
    86.   (use "git restore --staged <file>..." to unstage)
    87.         modified:   a.txt
    89. ##################### 提交暂存区到本地仓库 ####################
    90. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    91. $ git commit -m 'update a.txt'
    92. [master 26efdc6] update a.txt
    93.  1 file changed, 1 insertion(+)
    95. ##################### 查看提交日志 ####################
    96. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    97. $ git log
    98. commit 26efdc650e02e9615660d1bbb2d130c4d5d90619 (HEAD -> master)
    99. Author: “peng” <“473459100@qq.com”>
    100. Date:   Wed Jun 29 17:10:29 2022 +0800
    102.     update a.txt
    104. commit 8b094a669ace594b10d9be8b965f161b02ba34ac
    105. Author: “peng” <“473459100@qq.com”>
    106. Date:   Wed Jun 29 17:05:57 2022 +0800
    108.     adding a.txt to repo
    110. ##################### 采用别名git-log查看提交日志 ####################
    111. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    112. $ git-log
    113. * 26efdc6 (HEAD -> master) update a.txt
    114. * 8b094a6 adding a.txt to repo
    116. ##################### 查看文件内容 ####################
    117. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    118. $ cat a.txt
    119. i am chinese!
    122. ##################### 版本回退 ####################
    123. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    124. $ git reset --hard 8b094a6
    125. HEAD is now at 8b094a6 adding a.txt to repo
    128. ##################### 再次查看提交日志 ####################
    129. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    130. $ git-log
    131. * 8b094a6 (HEAD -> master) adding a.txt to repo
    133. ##################### 目录下创建git忽略文件 ####################
    134. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    135. $ touch .gitignore
    137. ##################### 目录下创建一个b.a文件 ####################
    138. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    139. $ touch b.a
    141. ##################### 编辑git忽略文件，让git忽略.a文件 ####################
    142. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    143. $ vi .gitignore
    145. ##### 可以看到只有.gitignore文件没有加入到暂存区，a.b没报，被git忽略了 ########
    146. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    147. $ git status
    148. On branch master
    149. Untracked files:
    150.   (use "git add <file>..." to include in what will be committed)
    151.         .gitignore
    153. nothing added to commit but untracked files present (use "git add" to track)

    创建分支、切换分支、合并分支：

    1. ##################### master分支中切换到dev01分支 ####################
    2. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    3. $ git checkout dev01
    4. Switched to branch 'dev01'
    7. ##################### dev01分支中新建一个dev01.txt ####################
    8. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    9. $ touch dev01.txt
    12. ##################### dev01.txt添加 ####################
    13. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    14. $ git add .
    16. ##################### dev01.txt提交到仓库 ####################
    17. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    18. $ git commit -m 'add dev01'
    19. [dev01 b3e84b5] add dev01
    20.  2 files changed, 0 insertions(+), 0 deletions(-)
    21.  create mode 100644 b.a
    22.  create mode 100644 dev01.txt
    25. ##################### 查看日志 ####################
    26. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    27. $ git-log
    28. * b3e84b5 (HEAD -> dev01) add dev01
    29. | * d776e70 (master) add ignore file
    30. |/
    31. * 8b094a6 adding a.txt to repo
    33. ##################### 切换到master，观察两个分支的文件目录结构变化 ##############
    34. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    35. $ git checkout master
    36. Switched to branch 'master'

    image.pngimage.png
    可以发现在dev01中创建的文件，在master中是没有的，可以通过合并两分支解决。

    1. ##################### 合并分支前要先切换到master ##############
    2. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (dev01)
    3. $ git checkout master
    4. Switched to branch 'master'
    6. ##################### 将dev01分支合并到merge分支 ##############
    7. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    8. $ git merge dev01
    9. Merge made by the 'ort' strategy.
    10.  b.a       | 0
    11.  dev01.txt | 0
    12.  2 files changed, 0 insertions(+), 0 deletions(-)
    13.  create mode 100644 b.a
    14.  create mode 100644 dev01.txt
    16. ##################### 查看修改日志 ##############
    17. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    18. $ git-log
    19. *   0fcb629 (HEAD -> master) Merge branch 'dev01'
    20. |\
    21. | * b3e84b5 (dev01) add dev01
    22. * | d776e70 add ignore file
    23. |/
    24. * 8b094a6 adding a.txt to repo

    Gitee码云配置：

    1. ##################### 生成SSH公钥 ##############
    2. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    3. $ ssh-keygen -t rsa
    4. Generating public/private rsa key pair.
    5. Enter file in which to save the key (/c/Users/47345/.ssh/id_rsa):
    6. /c/Users/47345/.ssh/id_rsa already exists.
    7. Overwrite (y/n)?
    10. ##################### 获取公钥，打开这个.pub文件即可 ##############
    11. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    12. $ cat ~/.ssh/id_rsa.pub
    13. ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDm/UDDewd6/bbywFCZp9TIlmFSdaU6L3/sVTEJ/uWedv2SKpIoMJOUp3Iqnc9668+fQkB6zA7GdHVbCAHJ0st0OhCVvkKKKuB83CG8F7RmizVoDsduQTBRuXLLte4rUJOcd5tH9iOYqniERNYS/bsd47sh/WjlE/aL2ufdjOLZgpUWuG4MjgNFBqxKtkbFBubiAfcmM4svbjxqogriTxkMXMK8DylybikSsVM01nBTo+bsRRJMn1Pay3VfJ1fyMq7bbgRxuuW41VyXWPi/eCE/MkQnHK2iG5tRav4kJ9tevl6Rb+WntBHVeeqdKWU6h0jOhpEcZ5juOMfh3beI7Q+9ngZE2BbVdQA1HM8aa54cuuj/UxKNFUjz57rwrwmEtBZZgjOEc7Zv/zv2VMDF32FvZLdwB4tqWOTpfYw4WxBoaWmB9mu1cbHc8qPHEYIhNxEZKfc196jYnp+bjGnttfE446Vyq32EHzl0oV0RtDe7ovtrCvvdT7GEq6hGyd7JHDM= 47345@DESKTOP-O86FLIS
    15. ##################### 验证是否配置成功 ##############
    16. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    17. $ ssh -T git@gitee.com
    18. The authenticity of host 'gitee.com (212.64.63.190)' can't be established.
    19. ED25519 key fingerprint is SHA256:+ULzij2u99B9eWYFTw1Q4ErYG/aepHLbu96PAUCoV88.
    20. This key is not known by any other names
    21. Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
    22. Warning: Permanently added 'gitee.com' (ED25519) to the list of known hosts.
    23. Hi 阿鹏! You've successfully authenticated, but GITEE.COM does not provide shell access.
    26. ##################### 添加远程仓库 ##############
    27. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    28. $ git remote add origin https://gitee.com/yudongshao/git_test.git
    31. ##################### 查看远程仓库 ##############
    32. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    33. $ git remote
    34. origin
    37. ##################### 推送到远程仓库 ##############
    38. 47345@DESKTOP-O86FLIS MINGW64 /g/git-repo (master)
    39. $ git push origin master:master
    40. Enumerating objects: 10, done.
    41. Counting objects: 100% (10/10), done.
    42. Delta compression using up to 4 threads
    43. Compressing objects: 100% (7/7), done.
    44. Writing objects: 100% (10/10), 805 bytes | 161.00 KiB/s, done.
    45. Total 10 (delta 3), reused 0 (delta 0), pack-reused 0
    46. remote: Powered by GITEE.COM [GNK-6.3]
    47. To https://gitee.com/yudongshao/git_test.git
    48.  * [new branch]      master -> master