User Tools

Site Tools


docu:csheet:sysadm:script:git:merge_upstream

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
docu:csheet:sysadm:script:git:merge_upstream [2021/10/20 07:17]
admin
docu:csheet:sysadm:script:git:merge_upstream [2021/10/20 07:19] (current)
admin
Line 5: Line 5:
  
 <code bash> <code bash>
-# clone your repo (if you didnt yet)+# clone your repo (if you didn'yet)
 git clone https://git.nogafam.es/nogafam/instante-social.git git clone https://git.nogafam.es/nogafam/instante-social.git
 cd instante-social cd instante-social
Line 12: Line 12:
 #  (a standard way to call it, but you can call it whatever) #  (a standard way to call it, but you can call it whatever)
 git remote add upstream https://github.com/mastodon/mastodon.git git remote add upstream https://github.com/mastodon/mastodon.git
 +
 +# this previous steps, will only be done ONCE. 
 +#  If you already have remotes configured, skip previous steps
  
 # get all upstream data and pull "main" branch # get all upstream data and pull "main" branch
docu/csheet/sysadm/script/git/merge_upstream.txt · Last modified: 2021/10/20 07:19 by admin