github.com/fjballest/golang@v0.0.0-20151209143359-e4c5fe594ca8/guide (about)

     1  SHARED REPO AT /zx/sys/golang
     2  
     3  The golang.git repo at git@git was created as a google fork:
     4  	git clone -bare https://go.googlesource.com/go
     5  The /zx clone is
     6  	git clone git@git.lsub.org:Public/git/golang.git golang
     7  	git remote add upstream https://go.googlesource.com/go
     8  
     9  Next commands show how to work in it:
    10  
    11  Fetch changes from google
    12  	git fetch upstream
    13  
    14  make sure you are in the local master branch
    15  	git checkout master
    16  
    17  merge changes from upstream's master
    18  	git merge upstream/master
    19  
    20  have fun with conflicts, you might just
    21  	git checkout origin/master file
    22  or
    23  	git checkout upstream/master file
    24  to opt for the origin or the upstream version of the file
    25  
    26  Push resulting changes to lsub's master
    27  	git push
    28  
    29  LOCAL-REPOS FOR USERS
    30  
    31  You might just
    32  	git clone git@git.lsub.org:Public/git/golang.git golang
    33  
    34  and use
    35  
    36  git pull -v
    37  git status
    38  git add -vv --all .
    39  git commit  -m 'cmd fixes and adds'
    40  git push -v