0. 命令速查

Git - 图1

Git - 图2

1. 创建版本库

  1. # 进入一个准备用作版本库的文件夹内
  2. Ahang@Ahang MINGW64 ~
  3. $ cd Documents/Git/
  5. # 初始化创建该库
  6. Ahang@Ahang MINGW64 ~/Documents/Git
  7. $ git init
  8. Initialized empty Git repository in C:/Users/Ahang/Documents/Git/.git/
  1. // 复制一个已创建的仓库:
  2.  git clone ssh://user@domain.com/repo.git

2. 将文件添加到版本库中

  • 先在版本库的文件夹里面添加文件如：README,可以写入些内容
  • 再通过git add README添加至库中
  • 最后通过git commit -m "wrote a README file" 后面的" "内容可以根据实际情况填写
  1. # 可以通过dir, ls 查看当前目录下文件
  2. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  3. $ dir
  4. README
  6. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  7. $ ls
  8. README
  10. # 添加到版本库
  11. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  12. $ git add README
  14. # 提交到库内，并加以注解，方便自己和他人查看
  15. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  16. $ git commit -m "wrote a README file"
  17. [master (root-commit) ae27363] wrote a README file
  18.  1 file changed, 2 insertions(+)
  19.  create mode 100644 README

对于同时添加多个文件时

  1. # 创建3个文件
  2. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  3. $ touch a
  5. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  6. $ touch c
  8. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  9. $ touch b
  11. # 报错示例：直接提交还没有添加时
  12. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  13. $ git commit -m "add 3 files"
  14. On branch master
  15. Untracked files:
  16.   (use "git add <file>..." to include in what will be committed)
  17.         a
  18.         c
  19.         b
  21. nothing added to commit but untracked files present (use "git add" to track)
  24. # 先添加，可以同时添加多个，空格隔开即可
  25. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  26. $ git add a b c
  28. # 再提交，会将目前添加还没有提交的全部提交
  29. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  30. $ git commit -m "add 3 files"
  31. [master 7602874] add 3 files
  32.  3 files changed, 0 insertions(+), 0 deletions(-)
  33.  create mode 100644 a
  34.  create mode 100644 b
  35.  create mode 100644 c

3. 对仓库文件修改并保存

  • 查看仓库状态：git status
  • 查看修改后文件的区别：git diff README
  • 然后对文件保存通过git add README和 git commit -m <detail>
  1. # 查看状态
  2. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  3. $ git status
  4. On branch master
  5. nothing to commit, working tree clean
  7. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  8. $ git status
  9. On branch master
  10. Changes not staged for commit:
  11.   (use "git add <file>..." to update what will be committed)
  12.   (use "git restore <file>..." to discard changes in working directory)
  13.         modified:   README
  15. no changes added to commit (use "git add" and/or "git commit -a")
  17. # 查看区别
  18. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  19. $ git diff README
  20. diff --git a/README b/README
  21. index 75977d0..682c059 100644
  22. --- a/README
  23. +++ b/README
  24. @@ -1,2 +1,4 @@
  25.  Hello world!!!
  26. -This is my frist example!
  27. \ No newline at end of file
  28. +This is my second examples!
  29. +
  30. +add some word
  31. \ No newline at end of file
  33. # 文件保存
  34. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  35. $ git add README
  37. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  38. $ git status
  39. On branch master
  40. Changes to be committed:
  41.   (use "git restore --staged <file>..." to unstage)
  42.         modified:   README
  45. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  46. $ git commit -m "add some word"
  47. [master adde561] add some word
  48.  1 file changed, 3 insertions(+), 1 deletion(-)
  50. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  51. $ git status
  52. On branch master
  53. nothing to commit, working tree clean

4. 对修改过的文件还原到修改前和修改后

  • 修改前后跳转：git reset --hard commit_id

    • 跳到修改前一次：commit_id 改为HEAD^
    • 跳到修改前两次：commit_id 改为HEAD^^
    • 跳到修改前10次：commit_id 改为HEAD~10
    • 跳转到修改后某个点：commit_id改为该版本对应得hash值前几个唯一的字母如 a3798

  • 查看提交的版本记录，对修改前后，查看每个版本对应得hash值：git log或git log --pretty=oneline

  • 回到跳转前版本，此时查看log没有，需要查看历史记录: git reflog

  • 原理：对多个版本的会记录下多个节点，通过HEAD指针指向当前版本文档，对文档的版本指定修改实质上也就是修改了HEAD指针的位置

—-vision1—-vision2—-vision3 <—HEAD

  1. # 查看提交的版本记录
  2. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  3. $ git log
  4. commit a47393fb96dea41a21d9d674b6e12faff06b6edc (HEAD -> master)
  5. Author: ahang1598 <hcie_zpc@163.com>
  6. Date:   Fri Jul 17 21:44:58 2020 +0800
  8.     add GPL
  10. commit adde56105ebed13fe13dd735343dff32d6ddb8a9
  11. Author: ahang1598 <hcie_zpc@163.com>
  12. Date:   Fri Jul 17 21:34:55 2020 +0800
  14.     add some word
  16. ~
  18. # 查看提交的版本记录简易版
  19. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  20. $ git log --pretty=oneline
  21. a47393fb96dea41a21d9d674b6e12faff06b6edc (HEAD -> master) add GPL
  22. adde56105ebed13fe13dd735343dff32d6ddb8a9 add some word
  23. ae27363a081d748911a88b6bbf86054f2373baf3 wrote a README file
  25. # 还原上一个版本
  26. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  27. $ git reset --hard HEAD^
  28. HEAD is now at adde561 add some word
  30. # 查看内容
  31. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  32. $ cat README
  33. Hello world!!!
  34. This is my second examples!
  36. add some word
  38. # 此时再查看提交的版本记录，就没有了最后一次提交的了
  39. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  40. $ git log
  41. commit adde56105ebed13fe13dd735343dff32d6ddb8a9 (HEAD -> master)
  42. Author: ahang1598 <hcie_zpc@163.com>
  43. Date:   Fri Jul 17 21:34:55 2020 +0800
  45.     add some word
  47. # 此时可以通过查看历史记录找到对应得commit_id
  48. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  49. $ git reflog
  50. adde561 (HEAD -> master) HEAD@{0}: reset: moving to HEAD^
  51. a47393f HEAD@{1}: reset: moving to a4739
  52. adde561 (HEAD -> master) HEAD@{2}: reset: moving to HEAD^
  53. a47393f HEAD@{3}: commit: add GPL
  54. adde561 (HEAD -> master) HEAD@{4}: commit: add some word
  55. cbbddf8 HEAD@{5}: commit: add 6 files
  56. 7602874 HEAD@{6}: commit: add 3 files
  57. ae27363 HEAD@{7}: commit (initial): wrote a README file
  59. # 跳转到指定的commit_id
  60. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  61. $ git reset --hard a4739
  62. HEAD is now at a47393f add GPL

5. 撤销修改

  • 命令git checkout -- readme.txt意思就是，把readme.txt文件在工作区的修改全部撤销，这里有两种情况：

    • 一种是readme.txt自修改后还没有被放到暂存区，现在，撤销修改就回到和版本库一模一样的状态；
    • 一种是readme.txt已经添加到暂存区后，又作了修改，现在，撤销修改就回到添加到暂存区后的状态

撤销修改☞回到最后一个状态

6. 撤销删除

  1. 对于已经在仓库/工作区里面的文件删除：git rm README
  2. 对于删除的文件恢复，先要从版本区恢复到暂存区:git restore --staged README
  3. 再从暂存区恢复到工作区和仓库中:git checkout -- README
  1. # 先删除
  2. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  3. $ git rm README
  4. rm 'README'
  6. # 查看状态，已删除
  7. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  8. $ git status
  9. On branch master
  10. Changes to be committed:
  11.   (use "git restore --staged <file>..." to unstage)
  12.         deleted:    README
  14. # 此时还没有提交，文件仍在在仓库里面，但是工作区没有了
  15. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  16. $ git log --pretty=oneline
  17. 492042c21840a7feb35984cd8a782c2cac7711f1 (HEAD -> master) remove a
  18. 43ede64fbf10c501c8969c831aa92e53ef4bae07 add boss
  19. 385781f7b45fab5e48f51addc205ac982b7542ae add a delete
  20. 714b14f8c577a4b4dedc0b650c01f322bc127080 delete chinese character
  21. 0f77a88b30fbfe27f50a2255cffb646abdfc82a4 add some
  22. a47393fb96dea41a21d9d674b6e12faff06b6edc add GPL
  23. adde56105ebed13fe13dd735343dff32d6ddb8a9 add some word
  24. cbbddf8cf9394d2ed57523d87ca3a3546088bc5d add 6 files
  25. 7602874655e60aed97b4b7f0c3e5eec1a5f97a1b add 3 files
  26. ae27363a081d748911a88b6bbf86054f2373baf3 wrote a README file
  28. # 工作区已被删除
  29. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  30. $ ls
  31.  a  'a[a-c]'   b   bb   cc   cc,dd   dd
  33. # 直接从暂存区无法恢复
  34. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  35. $ git checkout -- README
  36. error: pathspec 'README' did not match any file(s) known to git
  38. # 从仓库里面恢复到暂存区
  39. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  40. $ git restore --staged README
  42. # 再从暂存区恢复到工作区
  43. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  44. $ git restore README
  46. Ahang@Ahang MINGW64 ~/Documents/Git (master)
  47. $ ls
  48.  a  'a[a-c]'   b   bb   cc   cc,dd   dd   README

如果删除后提交了的话需要git reset --hard commit_id去回退操作

7. 连接github操作

7.1 首次将本地库同步到远程库中

  1. echo "# resume" >> README.md
  2. git init
  3. git add README.md
  4. git commit -m "first commit"
  5. git branch -M main
  6. git remote add origin git@github.com:ahang1598/resume.git
  7. git push -u origin main
  1. git remote add origin git@github.com:ahang1598/resume.git
  2. git branch -M main
  3. git push -u origin main

7.2 将本地库同步到远程库中

要关联一个远程库，使用命令git remote add origin git@server-name:path/repo-name.git；

关联后，使用命令git push -u origin master第一次推送master分支的所有内容；

此后，每次本地提交后，只要有必要，就可以使用命令git push origin master推送最新修改

7.2 将远程库克隆到本地

$ git clone git@github.com:ahang1598/spider.git

7.3 修改部分本地代码后同步远程库

思路是将整个git上的代码都clone下来，然后手动把自己的文件拉进指定文件夹，再上传上去

一.创建一个文件夹”text”来右击点git bash

  1. 1.git init  
  3. 2.git clone [https].git

假设clone下来的文件名叫A

二.clone成功后我们打开A，将本地要上传的文件拖到指定文件夹内，然后git bash clone下来的文件A

  1. 1.git init   默认下载下来的文件中包含了初始化的文件，无需初始化
  3. 2.git add .                注意add后面有一个空格和一个点
  5. 3.git commit -m  "提交的注释"
  7. git branch -M main 如果本地还是master
  9. 4. git push origin main

7.4 获取远程仓库并更新到本地仓库

git pull：相当于是从远程获取最新版本并merge到本地

  1. $ git checkout branch2
  2. $ git pull origin branch2

7.5在远程仓库和本地仓库都发生了变化后想要将本地修改提交到远程的流程：

  1. git add .，然后git commit提交本地仓库
  2. git pull拉取远程仓库，提示不能自动合并
  3. 手动解决矛盾，修改文件后再次git add.，git commit
  4. git push成功