User Tools

Site Tools


сервис_git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revision Both sides next revision
сервис_git [2022/08/16 14:00]
val [Пример с тестовой веткой]
сервис_git [2022/09/28 06:49]
val [Сервис Git]
Line 1: Line 1:
 ====== Сервис Git ====== ====== Сервис Git ======
 +
 +  * [[https://​ru.wikipedia.org/​wiki/​Git|Git - Википедия]]
  
   * [[https://​git-scm.com/​book/​ru/​v2/​|The entire Pro Git book (на русском)]]   * [[https://​git-scm.com/​book/​ru/​v2/​|The entire Pro Git book (на русском)]]
Line 9: Line 11:
   * [[https://​www.theserverside.com/​feature/​Why-GitHub-renamed-its-master-branch-to-main|Why GitHub renamed its master branch to main]]   * [[https://​www.theserverside.com/​feature/​Why-GitHub-renamed-its-master-branch-to-main|Why GitHub renamed its master branch to main]]
  
-  * [[https://​youtu.be/​SEvR78OhGtw|youtube/​Артем Матяшов/​Git. Большой практический выпуск]]+  * [[https://​youtu.be/​SEvR78OhGtw|youtube/​Артем Матяшов/​Git. Большой практический выпуск ​(youtube)]]
 ===== Работа с локальным репозиторием ===== ===== Работа с локальным репозиторием =====
  
Line 111: Line 113:
  
 ==== On-Premise gitlab ==== ==== On-Premise gitlab ====
 +
 +  * [[https://​stackoverflow.com/​questions/​6565357/​git-push-requires-username-and-password|Git push requires username and password]]
 +
 <​code>​ <​code>​
 $ git remote -v $ git remote -v
Line 117: Line 122:
  
 $ git branch $ git branch
 +
 +$ ### git config credential.helper store
  
 $ git push origin master $ git push origin master
 +
 +$ ### cat ~/​.git-credentials
 </​code>​ </​code>​
  
Line 204: Line 213:
 λ git checkout test λ git checkout test
  
-... edit ... commit ... +... edit ... commit ... 
- +
-λ git push -u origin test+
  
 +λ git push origin test
  
 root@server:​~/​openvpn1#​ git pull origin test root@server:​~/​openvpn1#​ git pull origin test
Line 215: Line 223:
  
  
 +λ git checkout main
 +
 +λ git merge test
  
-$ git checkout main+... commit ...
  
-git push -u origin main+λ git push -u origin main
  
 ... ci/cd prod ... ... ci/cd prod ...
сервис_git.txt · Last modified: 2023/09/14 15:37 by val