devbox
菜鸟追梦旅行
这个屌丝很懒，什么也没留下！
关注作者
热门标签
热门文章
当前位置:   article > 正文

git使用笔记_gerrit怎样修改配置的邮箱

作者：菜鸟追梦旅行 | 2024-04-15 12:36:52

赞

踩

gerrit怎样修改配置的邮箱

 常用命令

1.git config命令查看用户名，邮箱

git config user.name

git config user.email

 2.git config命令 修改自己的用户名和邮箱

//仅对当前仓库有效
git config --local user.email "你的名字"
git config --local user.email "你的邮箱"

//对当前用户的所有仓库有效
git config --global user.email "你的名字"
git config --global user.email "你的邮箱"
 

  1. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo
  2. #初始化本地目录
  3. $ git init
  4. Initialized empty Git repository in D:/file/gitspace/git-demo/.git/
  5.  
  6. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  7. $ ll
  8. total 0
  9.  
  10. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  11. $ ll -a
  12. total 4
  13. drwxr-xr-x 1 BOCO 197121 0 Mar 21 17:32 ./
  14. drwxr-xr-x 1 BOCO 197121 0 Mar 21 17:32 ../
  15. drwxr-xr-x 1 BOCO 197121 0 Mar 21 17:32 .git/
  16.  
  17. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  18. $ ll
  19. total 0
  20.  
  21. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  22. $ vi first-demo.txt
  23.  
  24. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  25. $ git status
  26. On branch master
  27.  
  28. No commits yet
  29.  
  30. Untracked files:
  31.   (use "git add <file>..." to include in what will be committed)
  32.         first-demo.txt
  33.  
  34. nothing added to commit but untracked files present (use "git add" to track)
  35.  
  36. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  37. #添加暂存区
  38. $ git add first-demo.txt
  39. warning: in the working copy of 'first-demo.txt', LF will be replaced by CRLF the next time Git touches it
  40.  
  41. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  42. $ git status
  43. On branch master
  44.  
  45. No commits yet
  46.  
  47. Changes to be committed:
  48.   (use "git rm --cached <file>..." to unstage)
  49.         new file:   first-demo.txt
  50.  
  51.  
  52. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  53. #删除暂存区
  54. $ git rm --cached  first-demo.txt
  55. rm 'first-demo.txt'
  56.  
  57. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  58. $ git status
  59. On branch master
  60.  
  61. No commits yet
  62.  
  63. Untracked files:
  64.   (use "git add <file>..." to include in what will be committed)
  65.         first-demo.txt
  66.  
  67. nothing added to commit but untracked files present (use "git add" to track)
  68.  
  69. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  70. $ ll
  71. total 1
  72. -rw-r--r-- 1 BOCO 197121 81 Mar 21 17:41 first-demo.txt
  73.  
  74. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  75. $ git add first-demo.txt
  76. warning: in the working copy of 'first-demo.txt', LF will be replaced by CRLF the next time Git touches it
  77.  
  78. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  79. #提交本地库
  80. $ git commit -m "first commit" first-demo.txt
  81. warning: in the working copy of 'first-demo.txt', LF will be replaced by CRLF the next time Git touches it
  82. [master (root-commit) e2d4217] first commit
  83.  1 file changed, 9 insertions(+)
  84.  create mode 100644 first-demo.txt
  85.  
  86. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  87. $ git status
  88. On branch master
  89. nothing to commit, working tree clean
  90.  
  91. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  92. $ git log
  93. commit e2d4217ecfdb63e0c0a4b6de6e90bb9232b50e30 (HEAD -> master)
  94. Author: smile <jiulongyueer@outlook.com>
  95. Date:   Tue Mar 21 17:42:32 2023 +0800
  96.  
  97.     first commit
  98.  
  99. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  100. $ git relog
  101. git: 'relog' is not a git command. See 'git --help'.
  102.  
  103. The most similar command is
  104.         reflog
  105.  
  106. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  107. $ git reflog
  108. e2d4217 (HEAD -> master) HEAD@{0}: commit (initial): first commit
  109.  
  110. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  111. $
  112. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  113. $ vi first-demo.txt
  114.  
  115.  
  116. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  117. #修改文件内容12345678
  118. $ cat first-demo.txt
  119. hello git
  120. hello git
  121. 12345678
  122. hello git
  123. hello git
  124. hello git
  125. hello git
  126. hello git
  127. hello git
  128.  
  129. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  130. $ git status
  131. On branch master
  132. Changes not staged for commit:
  133.   (use "git add <file>..." to update what will be committed)
  134.   (use "git restore <file>..." to discard changes in working directory)
  135.         modified:   first-demo.txt
  136.  
  137. no changes added to commit (use "git add" and/or "git commit -a")
  138.  
  139. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  140. $ git add first-demo.txt
  141. warning: in the working copy of 'first-demo.txt', LF will be replaced by CRLF the next time Git touches it
  142.  
  143. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  144. $ git commit -m "second commit" first-demo.txt
  145. warning: in the working copy of 'first-demo.txt', LF will be replaced by CRLF the next time Git touches it
  146. [master 8a4ea4f] second commit
  147.  1 file changed, 1 insertion(+), 1 deletion(-)
  148.  
  149. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  150. $ git status
  151. On branch master
  152. nothing to commit, working tree clean
  153.  
  154. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  155. $ git reflog
  156. 8a4ea4f (HEAD -> master) HEAD@{0}: commit: second commit
  157. e2d4217 HEAD@{1}: commit (initial): first commit
  158.  
  159. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)

版本穿梭

  1. $ git reflog
  2. 8a4ea4f (HEAD -> master) HEAD@{0}: commit: second commit
  3. e2d4217 HEAD@{1}: commit (initial): first commit
  4.  
  5. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  6. $ ^C
  7.  
  8. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  9. $ git log
  10. commit 8a4ea4fa40ce2adf9553998ffcccd8af4bedb14a (HEAD -> master)
  11. Author: smile <jiulongyueer@outlook.com>
  12. Date:   Wed Mar 22 11:28:28 2023 +0800
  13.  
  14.     second commit
  15.  
  16. commit e2d4217ecfdb63e0c0a4b6de6e90bb9232b50e30
  17. Author: smile <jiulongyueer@outlook.com>
  18. Date:   Tue Mar 21 17:42:32 2023 +0800
  19.  
  20.     first commit
  21.  
  22. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  23. $ git reset --hard 8a4ea4f
  24. HEAD is now at 8a4ea4f second commit
  25.  
  26. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  27. $ git reflog
  28. 8a4ea4f (HEAD -> master) HEAD@{0}: reset: moving to 8a4ea4f
  29. 8a4ea4f (HEAD -> master) HEAD@{1}: commit: second commit
  30. e2d4217 HEAD@{2}: commit (initial): first commit
  31.  
  32. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  33. $ cat first-demo.txt
  34. hello git
  35. hello git
  36. 12345678
  37. hello git
  38. hello git
  39. hello git
  40. hello git
  41. hello git
  42. hello git
  43.  
  44. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  45. $ git reset --hard e2d4217
  46. HEAD is now at e2d4217 first commit
  47.  
  48. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  49. $ git reflog
  50. e2d4217 (HEAD -> master) HEAD@{0}: reset: moving to e2d4217
  51. 8a4ea4f HEAD@{1}: reset: moving to 8a4ea4f
  52. 8a4ea4f HEAD@{2}: commit: second commit
  53. e2d4217 (HEAD -> master) HEAD@{3}: commit (initial): first commit
  54.  
  55. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  56. $ cat first-demo.txt
  57. hello git
  58. hello git
  59.  
  60. hello git
  61. hello git
  62. hello git
  63. hello git
  64. hello git
  65. hello git
  66.  
  67. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  68. $

 Git分支

在版本控制过程中，同时推进多个任务，为每个任务，我们就可以创建每个任务的单独分支。使用分支意味着程序员可以把自己的工作从开发主线上分离开来，开发自己分支的时候，不会影响主线分支的运行。对于初学者而言，分支可以简单理解为副本，一个分支就是一个单独的副本。(分支底层其实也是指针的引用)

 分支的操作：

命令名称作用
git branch 分支名创建分支
git branch -v查看分支
git checkout 分支名切换分支
git merge 分支名把指定的分支合并到当前分支上

新建一个分支，然后切换分支hot-fix修改文件，修改后回到master分支查看。

  1. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  2. $ cat first-demo.txt
  3. hello git
  4. hello git
  5.  
  6. hello git
  7. hello git
  8. hello git
  9. hello git
  10. hello git
  11. hello git
  12.  
  13. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  14. $ ^C
  15.  
  16. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  17. $ git branch hot-fix
  18.  
  19. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  20. $ git branch -v
  21.   hot-fix e2d4217 first commit
  22. * master  e2d4217 first commit
  23.  
  24. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  25. $ git checkout hot-fix
  26. Switched to branch 'hot-fix'
  27.  
  28. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  29. $ vim first-demo.txt
  30.  
  31. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  32. $ cat first-demo.txt
  33. hello git
  34. hello git
  35. hello git
  36. hello git
  37. hello git
  38. hello git
  39. hello git
  40. hello git
  41. fix finish
  42.  
  43. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  44. $ git status
  45. On branch hot-fix
  46. Changes not staged for commit:
  47.   (use "git add <file>..." to update what will be committed)
  48.   (use "git restore <file>..." to discard changes in working directory)
  49.         modified:   first-demo.txt
  50.  
  51. no changes added to commit (use "git add" and/or "git commit -a")
  52.  
  53. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  54. $ git add first-demo.txt
  55.  
  56. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  57. $ git commit -m "hot-fix first commit" first-demo.txt
  58. [hot-fix 0876f30] hot-fix first commit
  59.  1 file changed, 1 insertion(+), 1 deletion(-)
  60.  
  61. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  62. $ git checkout master
  63. Switched to branch 'master'
  64.  
  65. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  66. $ cat first-demo.txt
  67. hello git
  68. hello git
  69.  
  70. hello git
  71. hello git
  72. hello git
  73. hello git
  74. hello git
  75. hello git
  76.  
  77. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)

 合并分支

  1. $ git merge hot-fix
  2. Updating e2d4217..0876f30
  3. Fast-forward
  4.  first-demo.txt | 2 +-
  5.  1 file changed, 1 insertion(+), 1 deletion(-)
  6.  
  7. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  8. $ cat first-demo.txt
  9. hello git
  10. hello git
  11. hello git
  12. hello git
  13. hello git
  14. hello git
  15. hello git
  16. hello git
  17. fix finish
  18.  
  19. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  20. $

合并冲突：当两个版本之间合并时发生冲突，需要手动合并

  1. $ cat first-demo.txt
  2. hello git
  3. hello git
  4. hello git
  5. hello git
  6. hello git
  7. hello git
  8. hello git
  9. hello git
  10. fix finish  master
  11.  
  12. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  13. $ git add first-demo.txt
  14.  
  15. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  16. $ git commit -m "master first-test commit" first-demo.txt
  17. [master 09fe8f2] master first-test commit
  18.  1 file changed, 1 insertion(+), 1 deletion(-)
  19.  
  20. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  21. $ git checkout hot-fix
  22. Switched to branch 'hot-fix'
  23.  
  24. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  25. $ cat first-demo.txt
  26. hello git
  27. hello git
  28. hello git
  29. hello git
  30. hello git
  31. hello git
  32. hello git
  33. hello git
  34. fix finish
  35.  
  36. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  37. $ vi first-demo.txt
  38.  
  39. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  40. $ cat first-demo.txt
  41. hello git
  42. hello git
  43. hello git
  44. hello git
  45. hello git
  46. hello git
  47. hello git
  48. hello git  hot-fix
  49. fix finish
  50.  
  51. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  52. $ git add first-demo.txt
  53.  
  54. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  55. $ git commit -m "hot-fix second commit" first-demo.txt
  56. [hot-fix b55f4de] hot-fix second commit
  57.  1 file changed, 1 insertion(+), 1 deletion(-)
  58.  
  59. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  60. $ git checkout master
  61. Switched to branch 'master'
  62.  
  63. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  64. $ git merge hot-fix
  65. Auto-merging first-demo.txt
  66. CONFLICT (content): Merge conflict in first-demo.txt
  67. Automatic merge failed; fix conflicts and then commit the result.
  68.  
  69. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  70. $ cat first-demo.txt
  71. hello git
  72. hello git
  73. hello git
  74. hello git
  75. hello git
  76. hello git
  77. hello git
  78. <<<<<<< HEAD
  79. hello git
  80. fix finish  master
  81. =======
  82. hello git  hot-fix
  83. fix finish
  84. >>>>>>> hot-fix
  86. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  87. $ vi first-demo.txt
  89. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  90. $ git merge hot-fix
  91. error: Merging is not possible because you have unmerged files.
  92. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  93. hint: as appropriate to mark resolution and make a commit.
  94. fatal: Exiting because of an unresolved conflict.
  96. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  97. $ git add first-demo.txt
  99. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  100. #这里手动合并后不能跟文件名
  101. $ git commit -m "test merge" first-demo.txt
  102. fatal: cannot do a partial commit during a merge.
  104. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master|MERGING)
  105. $ git commit -m "test merge"
  106. [master 04c1998] test merge
  108. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  109. $ cat first-demo.txt
  110. hello git
  111. hello git
  112. hello git
  113. hello git
  114. hello git
  115. hello git
  116. hello git
  117. hello git
  118. hello git  hot-fix
  119. fix finish  master
  121. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  122. $ git checkout hot-fix
  123. Switched to branch 'hot-fix'
  125. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  126. $ cat first-demo.txt
  127. hello git
  128. hello git
  129. hello git
  130. hello git
  131. hello git
  132. hello git
  133. hello git
  134. hello git  hot-fix
  135. fix finish
  137. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  138. $

创建远程仓库：

 

 选择public，私有的有人数限制，多人建议自己搭建gitlab

 创建成功

然后创建远程库别名

基本语法：

git remote-v  查看当前所有远程地址别名

git remote add    别名  远程地址

  1. $ git remote -v
  2.  
  3. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  4. $ git remote add  git-demo https://github.com/SbossS/git-demo.git
  5.  
  6. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  7. $ git remote -v
  8. git-demo        https://github.com/SbossS/git-demo.git (fetch)
  9. git-demo        https://github.com/SbossS/git-demo.git (push)
  10.  
  11. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (hot-fix)
  12. $ git checkout master
  13. Switched to branch 'master'
  14.  
  15. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  16. $ ll
  17. total 1
  18. -rw-r--r-- 1 BOCO 197121 128 Mar 23 10:29 first-demo.txt
  19. #想远程仓库推送代码
  20. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  21. $ git push git-demo master
  22. Enumerating objects: 15, done.
  23. Counting objects: 100% (15/15), done.
  24. Delta compression using up to 4 threads
  25. Compressing objects: 100% (10/10), done.
  26. Writing objects: 100% (15/15), 1.14 KiB | 25.00 KiB/s, done.
  27. Total 15 (delta 5), reused 0 (delta 0), pack-reused 0
  28. remote: Resolving deltas: 100% (5/5), done.
  29. To https://github.com/SbossS/git-demo.git
  30.  * [new branch]      master -> master
  31. #从远程仓库拉取代码
  32. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  33. $ git pull git-demo master
  34. remote: Enumerating objects: 5, done.
  35. remote: Counting objects: 100% (5/5), done.
  36. remote: Compressing objects: 100% (2/2), done.
  37. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
  38. Unpacking objects: 100% (3/3), 661 bytes | 1024 bytes/s, done.
  39. From https://github.com/SbossS/git-demo
  40.  * branch            master     -> FETCH_HEAD
  41.    04c1998..be81036  master     -> git-demo/master
  42. Updating 04c1998..be81036
  43. Fast-forward
  44.  first-demo.txt | 1 +
  45.  1 file changed, 1 insertion(+)
  46.  
  47. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  48. $ ll
  49. total 1
  50. -rw-r--r-- 1 BOCO 197121 141 Mar 23 10:39 first-demo.txt
  51.  
  52. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  53. $ cat first-demo.txt
  54. hello git
  55. hello git
  56. hello git
  57. hello git
  58. hello git
  59. hello git
  60. hello git
  61. hello git
  62. hello git  hot-fix
  63. fix finish  master
  64. git editing
  65.  
  66. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  67. $

团队内合作

克隆远程仓库到本地

git clone 地址

两个账号  jiulong2023  SbossS 切换账号时需要删除凭据管理器里原来的账号

流程：新建 jiulong2023账号的目录，进入bash,然后clone文件，修改文件，add commit，退出SbossS 账号，用 jiulong2023账号登录git，SbossS 邀请 jiulong2023加入collaborators，然后jiulong2023提交远程仓库，然后删除凭据管理器里jiulong2023，切换到SbossS本地路径下pull代码。

bossS 邀请 jiulong2023加入collaborators

 jiulong2023：

  1. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong
  2. $ git clone https://github.com/SbossS/git-demo.git
  3. Cloning into 'git-demo'...
  4. remote: Enumerating objects: 18, done.
  5. remote: Counting objects: 100% (18/18), done.
  6. remote: Compressing objects: 100% (7/7), done.
  7. remote: Total 18 (delta 6), reused 14 (delta 5), pack-reused 0
  8. Receiving objects: 100% (18/18), done.
  9. Resolving deltas: 100% (6/6), done.
  10.  
  11. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong
  12. $ cd git-demo/
  13. '
  14. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  15. $
  17. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  18. $ ll
  19. total 1
  20. -rw-r--r-- 1 BOCO 197121 141 Mar 23 11:21 first-demo.txt
  22. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  23. $ vi first-demo.txt
  25. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  26. $ git remote -v
  27. origin  https://github.com/SbossS/git-demo.git (fetch)
  28. origin  https://github.com/SbossS/git-demo.git (push)
  30. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  31. $ git add first-demo.txt
  33. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  34. $ git commit -m "jiulong2023 commit" first-demo.txt
  35. [master 555ee70] jiulong2023 commit
  36.  1 file changed, 1 insertion(+)
  37. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)
  38. $ git push origin master
  39. Enumerating objects: 5, done.
  40. Counting objects: 100% (5/5), done.
  41. Delta compression using up to 4 threads
  42. Compressing objects: 100% (2/2), done.
  43. Writing objects: 100% (3/3), 292 bytes | 292.00 KiB/s, done.
  44. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
  45. remote: Resolving deltas: 100% (1/1), completed with 1 local object.
  46. To https://github.com/SbossS/git-demo.git
  47.    555ee70..764e202  master -> master
  49. BOCO@DESKTOP-8LO1E50 MINGW64 /d/jiulong/git-demo (master)

 SbossS：

  1. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  2. $ git pull git-demo master
  3. From https://github.com/SbossS/git-demo
  4.  * branch            master     -> FETCH_HEAD
  5. Updating be81036..764e202
  6. Fast-forward
  7.  first-demo.txt | 2 ++
  8.  1 file changed, 2 insertions(+)
  9.  
  10. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  11. $ cat
  12. .git/           first-demo.txt
  13.  
  14. BOCO@DESKTOP-8LO1E50 MINGW64 /d/file/gitspace/git-demo (master)
  15. $ cat first-demo.txt
  16. hello git
  17. hello git
  18. hello git
  19. hello git
  20. hello git
  21. hello git
  22. hello git
  23. hello git
  24. hello git  hot-fix
  25. fix finish  master
  26. git editing
  27. jiulong edit
  28. jiulong2023
  29.

 跨团队合作

SSH免密登录

进入用户目录，然后执行ssh-keygen -t rsa -C 邮箱 生成.ssh目录，将公钥拷贝在git设置SSH keys的位置。

  1. BOCO@DESKTOP-8LO1E50 MINGW64 ~
  2. $ pwd
  3. /c/Users/BOCO
  4.  
  5. BOCO@DESKTOP-8LO1E50 MINGW64 ~
  6. $ ssh-keygen -t rsa -C 邮箱
  7. Generating public/private rsa key pair.
  8. Enter file in which to save the key (/c/Users/BOCO/.ssh/id_rsa):
  9. Created directory '/c/Users/BOCO/.ssh'.
  10. Enter passphrase (empty for no passphrase):
  11. Enter same passphrase again:
  12. Your identification has been saved in /c/Users/BOCO/.ssh/id_rsa
  13. Your public key has been saved in /c/Users/BOCO/.ssh/id_rsa.pub
  14. The key fingerprint is:
  15. SHA256:VXmgdV7YDKqVMN3/8o5GtmiSW5YlcVsc5jd6e3TN/Ks 邮箱
  16. The key's randomart image is:
  17. +---[RSA 3072]----+
  18. |          o.++oB.|
  19. |           *o=*o+|
  20. |          o =.o++|
  21. |         . o o.==|
  22. |        S . ..o.B|
  23. |             +=.=|
  24. |           .++ =o|
  25. |          ooo o.+|
  26. |          .+ Eoo.|
  27. +----[SHA256]-----+
  31. BOCO@DESKTOP-8LO1E50 MINGW64 ~
  32. $ cd .ssh/
  34. BOCO@DESKTOP-8LO1E50 MINGW64 ~/.ssh
  35. $ ll
  36. total 5
  37. -rw-r--r-- 1 BOCO 197121 2602 Mar 23 17:40 id_rsa
  38. -rw-r--r-- 1 BOCO 197121  571 Mar 23 17:40 id_rsa.pub
  40. BOCO@DESKTOP-8LO1E50 MINGW64 ~/.ssh
  41. $ cat id_rsa.pub
  42. ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD2d5zdnDozcD/TGkQRuL9cu7/exYply9Uf+T8vitHT0KEKApw6NynK+bTbUa7JCApqEw5XuM2WOy3W8CGb2XXE2H96woITws8xKSV6hQ0e2DXabAIrU7CSb7tSzm/G7cE+xIzEuxUrbICfJG5Hc/f94MWBH4lVuDO/ynbq9cloX5vTiVj35tPymBf0D5cbtOwd3niqLN8SbeyipJ8tXCiN5lxQDifC5IrzzT9bnoRP9orbmAmu7Z2oP6Pxnd4omWWV7ZFF4f230/kSPGIQhq1fPxsrpJBrDglpy1mb6mG8iqhYuUWhHMgBVi5gomiib+Tv1x6BzUjPj1wwcGD1u/FpHxzjQsJt3VxAx75/6kaNSc9AJugDtjRBI1dmexI3xX5OmOiEnNhG3O7TB0MgYjzGLY808eSYFEmmUxtdVPEbWKqxeZhvMygoNLfkJYVL4ui4+PDe3GtgiGK5XLJjBY3NXqT24Y7TDjDwUc8OwjArbBk5ZeuyG4Uas0FyAo2JYbc= 邮箱

IDEA使用git

有些IDEA自身的以及不必要的文件需要忽略

为什么要忽略他们?
答:与项目的实际功能无关，不参与服务器上部署运行。把它们忽略掉能够屏蔽IDE 工具之间的差异。
怎么忽略?
1)创建忽略规则文件 xxxxignore (前缀名随便起，建议是 git.ignore)e
这个文件的存放位置原则上在哪里都可以，为了便于让~/.gitconfig 文件引用，建议也放在用户家目录下e
git.ignore 文件模版内容如下:

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.Zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

.classpath
.project
.settings
target
.idea
*.iml

 2)在gitconfig 文件中引用忽略配置文件(此文件在 Windows 的家目录中)
[user]
    name = smile
    email = jiulongyueer@outlook.com
[core]
excludesfile = C:/Users/BOCO/git.ignore

注意: 这里要使用“正斜线 (/)”，不要使用“反斜线 (\)”

file-setting

 

 

 IDEA切换版本

合并分支

正常合并

 

 

 站在master分支合并hot-fix

 冲突合并

 

 

IDEA集成GitHub

 用账号密码很难登录

 

 口令登录

 生成口令

 

 口令权限点满

 

分享项目到GitHub

 

 

 

 push推送到远程库

 默认

是HTTPS方式推送，这里选择ssh推送好点，点击Define Remote

 

 

 

 pull拉取远程代码

 克隆远程库代码到本地

 GITEE使用类似

 

 

从git复制代码到Gitee 

 

 

声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/菜鸟追梦旅行/article/detail/427927
推荐阅读
相关标签

Copyright © 2003-2013 www.wpsshop.cn 版权所有，并保留所有权利。

  

闽ICP备14008679号